Merge "build.sh: Pass TARGET_BUILD_UNBUNDLED_IMAGE if BUILDING_WITH_VSDK=true."