Merge "Track changes in libcore" am: a15ef2abab
am: 5defc912cd

* commit '5defc912cd2d8f15d03226b901ffc43db9f2d39e':
  Track changes in libcore