am 47aa51d0: am 70b74646: Merge "Track libcore changes."

* commit '47aa51d029b613a518a569eb798607f2fbda9330':
  Track libcore changes.