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

Change-Id: Ia3f2a9ac5843a32da7c730a172af248abebd7b00