Merge change 8339 into donut

* changes:
  Merge commit 'e6be85f5eb1438636e436be4162dd8f54a1192bf' into manualmergeDroiddoc
tree: 8e4f23bb5418b8fdc7c4d896eb2e6e3819c04b8f
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh