Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS"