am e3b94f05: Merge "Track libcore API change."

* commit 'e3b94f05b8be2b6305cbee77c23b7f7599bfcff7':
  Track libcore API change.