Merge "Add include directory to -header-filter"