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

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