Allow comments in flag and headers

Allow comments and empty lines in flag and header files.

Change-Id: I127ec83ffc926d0b80dcc725663afcca3aa79c5d