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

Change-Id: Idb7d4edd9de00025ae4af04c446654b1e7d8819b