Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev am: 2e0e7f3c94
am: 32eb4022fd

Change-Id: I3f0b1527ab5125b375878ec71de5501e27f04010