Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d."