manual merge
tree: ed278f6d234d0acf043e7193c175af0b2db41596
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh