am c56944ed: am ebda92b8: Merge "Track libcore cleanup."

* commit 'c56944ed951771670e0420a1a2b94d01b701f1b3':
  Track libcore cleanup.