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

Change-Id: I3c734734bf553e0b4695a897de113d9031f18abd