Merge "Merge "Track libcore change 03e8c7dca78a95ccf719a7." am: 194f8471 am: f06800c3 am: 58508dfd am: 2c9fc6f6"