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

* commit '8ad84feebb5eedeaf55ef8baa124a66e85152a1f':
  Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af

Change-Id: I5ab4b900938aa037b569c5d74b6ae5581c95ee94