Merge "Ensure /system/vendor symlink exists in target-files-package"