Merge "Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af" into nyc-dev