Merge "Track libcore change 03e8c7dca78a95ccf719a7." am: 194f8471fd am: f06800c3ff am: 58508dfd6e
am: 2c9fc6f6b7

Change-Id: I5af6e30af6478d070767fee87bc185f10bba2fa3