am bbd87eb9: Merge "Track libcore.os\' move to android.system."

* commit 'bbd87eb9193e9730869171324ee4f5fc1abeae55':
  Track libcore.os' move to android.system.