Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into stage-aosp-master am: e1cf90c6eb
am: e8f9aa9d5d
Change-Id: I9bf2d81a53209a45d6bc644e421fd387fe23fb84
This commit is contained in: