am ce566b50: am ee66531f: Merge "Track libcore API update."

* commit 'ce566b5068bb73b7e379bb40c3eb74922000bbd9':
  Track libcore API update.