Merge "Allow symlinks to device or vendor tree in envsetup.sh."