Merge change 8016 into donut

* changes:
  Fix compilation of assembly files (e.g. foo.S), by removing a typo.