Merge "Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4"