Merge "Track changes in libcore"
am: a15ef2abab

* commit 'a15ef2abab566468af66d431303a1645069dd094':
  Track changes in libcore