am c63c0682: am e3b94f05: Merge "Track libcore API change."

* commit 'c63c068228267b41fb106e22a6914ab19da9e5bc':
  Track libcore API change.