am ae1b6805: Merge "Track change to private libcore data structure."

* commit 'ae1b6805a2609759186af8d7131c4750e011019a':
  Track change to private libcore data structure.