am ebda92b8: Merge "Track libcore cleanup."

* commit 'ebda92b84aeac7a5c5a431d6d9cecea2c3c44a97':
  Track libcore cleanup.