AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"

Automated import of CL 145704
1 file changed
tree: 9aab55b2f9c37d0af1d9f2c347386e8e444b4622
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh