Merge "Move makefile comment to separate line" am: 3d960ddd27
am: 48612f9cb6

* commit '48612f9cb61795627aea54e7b66a12d9a457fa9a':
  Move makefile comment to separate line