am ee66531f: Merge "Track libcore API update."

* commit 'ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44':
  Track libcore API update.