gnulib-tool: Don't remove comments referencing @NMD@, part 2. * gnulib-tool (func_emit_tests_Makefile_am): Replace lines that start with @NMD@ or @!NMD@ instead of lines that contain them.