Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" am: 751e3af81e
am: 6b9cd13b05

Change-Id: Id77f008ca75d2570eb34d84950e24bac4e447df8