Merge "Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af" into nyc-dev am: 7d0b8d7
am: f501db5

* commit 'f501db55227dd6493fde67067097b1fab1ba56b7':
  Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af

Change-Id: Id10edab5e140f2df98b5f12e5c44656a033b4c9a