Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f." am: 60cbd0b02b
am: 9572aae96e

* commit '9572aae96ed644c18a9f456856ad34714ee31aeb':
  Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.