Merge "header-checker: Code cleanup" am: 3fc148f690
am: 24015b58e8

Change-Id: I91db5065da6e6046b0d5f387cc4248266c96312a