Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp