Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"