Merge "Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68" into nyc-dev