Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev