Merge "Allow symlinks to be included while collecting exported headers." am: 134adade am: dbe9898a am: 78c235bb Change-Id: I956d4476326a1f7131d82d435e021180e211106d