Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am: 53cf79e185
am: 75aee6f266

Change-Id: I30a3bc53262cc1f27b3c745af2a9b6a4d6357649