Merge "Track libcore change 135ea6cd4f7ebe2f225351a1928d8a62bce5cb00"