Merge branch 'donut' into donut-release

Conflicts:
	core/build_id.mk
tree: b890285c13b53fbf509ba0e70b4a6c8c91281a6a
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh