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

Change-Id: I211936cce1176268dcb2005182fe85f442413207