Merge "Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b"