Merge "Track libcore change 2c423c81bfa731df2577a."
am: a1fd14328e

* commit 'a1fd14328e990bc23dc5b8447bfe9839a3c7f137':
  Track libcore change 2c423c81bfa731df2577a.