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

Change-Id: Iab5a3288253edeed370e58296594faa3239b0196