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

* commit '20c3a1b47abc630cd18ac0c113529f9082a8af9b':
  Track libcore changes.