Merge change 8340 into donut

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