Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00"
am: 11b076b

* commit '11b076b7d35054709e5d072fdc874d1a20835328':
  Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00

Change-Id: I49e2d0b118f7a1617abec007522f02f45aff4a5d