Merge "header-checker: Fix unit test include directories" am: 3e48f47adc
am: a65d6604df

Change-Id: Ide154d4c5f3063d856ce615578afc25d18419c4b