Merge "Track libcore change e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4" into nyc-dev