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

* commit '60cbd0b02beb94b175e55d61bd64036a99029850':
  Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f.