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

Change-Id: I14acd4352f04f16294bfc1b97c2ad9a0b9a533d4