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

Change-Id: I7b83b123338946783edb98e2b8a8af2ea4aa1bcf