Merge change 2982 into donut

* changes:
  fix build break by reincluding empty method calls that were moved to macros.cs
tree: 621e5abfefdaa4f01ffeb75a61b421bd664738e2
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh