Merge "Track libcore change 5731615b4d705b5af63a3126d84b8786862477d." into nyc-dev
am: 2a5abc9510

* commit '2a5abc95104d109db3b09aa27c6718b2be7a975b':
  Track libcore change 5731615b4d705b5af63a3126d84b8786862477d.