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

Change-Id: If613d84d3faeb4a49188543f9009808a2d06fe30