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

Change-Id: I6c0ebb09325ab2f37469c9d4a5408f812380efc1