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

Change-Id: I512681e5a601e5d1e36979afef1fa3c443b2222c