Merge "Move definition of create-vendor-odm-symlink within BUILDING_VENDOR_IMAGE"