Merge "Gmake doesn\'t like newline in macro expansion result." am: c7d5e54dfe
am: fe27825ca5

* commit 'fe27825ca548e3f0afd869fd9dca91716c578457':
  Gmake doesn't like newline in macro expansion result.