am 4d86196f: am b37652a2: Merge "Track libcore API changes."

* commit '4d86196ff289084ff062073832fa3ab737ec0061':
  Track libcore API changes.