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

* commit '8f88f6ea649e1c5a3eb994fb2c1763b474077ec4':
  Track libcore commit aff7af3b344bf882620489631633e09fabfcd58d.