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

* commit '1a6fe26d1bd5bcfbd44ed9e6d2cf52c027b764a2':
  Track libcore API change.