Merge "Track libcore change 9fbdd1b27de1a3d1005468108." into nyc-dev