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

* commit 'fabbf9f78dc89475bec16b8d865402aa9c625b92':
  Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.