am 70cebe23: Merge change 8016 into donut

Merge commit '70cebe238ef4173fff66967af91ee3c1e0ffd521'

* commit '70cebe238ef4173fff66967af91ee3c1e0ffd521':
  Fix compilation of assembly files (e.g. foo.S), by removing a typo.