Merge "Allow symlinks to be included while collecting exported headers." am: 134adadef6 am: dbe9898aa0
am: 78c235bba2

Change-Id: I956d4476326a1f7131d82d435e021180e211106d