Merge "Track libcore change 45837f486a4fd1d0edc9bb5ab8f8cf0194204adc."