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

* commit '8966ec480deff0760de8e47e23b4f376ee72cc9c':

Change-Id: Ic962c01b0203c47f6eea91ac45e4834c159ee3df