Make nbnxn template and generated files match

Change-Id: I80b80e242d920862a64db22ae2321dcdb532faa1