am 9c8685b7: am f094eefc: am c5de9c35: Merge "Track libcore API update."

* commit '9c8685b714b38c2bbf09077b9cba73a95b734269':
  Track libcore API update.