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

* commit 'f14e6413b9e10df21fdb8de25f7da63f1ee7b31c':
  Track libcore change 5731615b4d705b5af63a3126d84b8786862477d.