Merge "Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4"
am: e8f7b80

* commit 'e8f7b80bcd1e7b73c82e3abf3f2fa50faed93ee1':
  Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4

Change-Id: Ia045e0b4c148a3fb460116e4d25a72de9d57b942