Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534
am: 0deb783a52

Change-Id: Icb3d257945201bdfdff1fb562d06faf3c009788d