Merge "Ensure /system/vendor symlink exists in target-files-package" am: ac8b2ab702
am: 5179e70cc3

Change-Id: I3e834d540c4b59c1499db2bd425cce2ef39ad986