am 324993ab: am 5216f11e: Merge "Track libcore API update."

* commit '324993abed48843da1cb63063668147151e4db5c':
  Track libcore API update.