Merge "header-checker: Fix unit test include directories"