Merge "Track libcore change (cherry picked from commit 5bad107355d440409eea313b60c40bc32c12e295)" into nyc-dev