Merge "Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d."
am: 0a1b294f68

* commit '0a1b294f68355ed118d9c8b71e7688a698483378':
  Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.