Merge change 4549 into donut

* changes:
  Merge commit 'b610c08b9605c31c1e5b851009104972e3822a3c' into Donut
tree: 8169174614a471d0f45809ff97efce926086ee83
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh