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

* commit '754caf6985fb4586dcb24336b890035c1b1b4e98':

Change-Id: I86f1f9be12b4adf7ab18c9dde793c2fd710f4d05