Merge "Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af"
am: c75055e

* commit 'c75055ebd8c7c53d1a5410b63fbe9113fd2b95ba':
  Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af

Change-Id: Ic589541339c0774e82e75cd004ddc3c9c0b04bbb