am 86aa1953: am 2a26547f: Merge "Track libcore API update."

* commit '86aa19532896dc6ede04d53ee96708becde9b0dc':
  Track libcore API update.