Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: bad21cb538
am: a5364b014b

Change-Id: I9a5755da3aba9b370b35bac17e184de58f7a27be