am c26e5505: Merge "Track libcore API update."

* commit 'c26e5505495f7a36163477e12098d5fd2822cae9':
  Track libcore API update.