Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" am: 1850851670
am: f5bdd8eae6

Change-Id: Iea16189bfbce1b11fa4a91501daba94c2c83a380