Merge \\\"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\\\" am: cf5b00e6bc am: 43714397df
am: b0d49c7cbb

Change-Id: I04214b3a71448b5a7e8bf65c7bef80482113dedd