Merge "Track libcore change 03e8c7dca78a95ccf719a7."
am: 194f8471fd

Change-Id: Ie4fbcc4defee14c91cd3b84adf4f3ae5f47add3f