Merge "Remove spaces from DEFAULT_TIDY_HEADER_DIRS" am: f69e48b30b am: 785d69a849
am: b4b610278b

Change-Id: Ia2891d68f9c20af23fb7ab4a0014a8c74104cfad