Merge "Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af" into nyc-dev
am: 7d0b8d7

* commit '7d0b8d792886b2ed5ff89ac6c2723fba9d44c7d4':
  Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af

Change-Id: I9687d53b467b656fd1381538b2f42645f9f49f7f