Merge change 3004 into donut

* changes:
  fix the SDK build for real this time. the missing macros weren't declared in the proper order last time.
tree: 72e8236224e4c584170e48e2cf2976c6a3d7e731
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh