Merge "Track libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde"
am: 93fdc3f

* commit '93fdc3faa2363d68edb4ef138575b3fa59920379':
  Track libcore change 848cf2e74b74b68c99b7b0a432263c3e57433fde