Merge "Pass userdebug/eng variant to Soong"

	echo '    "Binder32bit": $(if $(BINDER32BIT),true,false),'; \

	echo '    "DevicePrefer32BitExecutables": $(if $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)),true,false),'; \

	echo '    "UseGoma": $(if $(filter-out false,$(USE_GOMA)),true,false),'; \

	echo '    "Debuggable": $(if $(filter userdebug eng,$(TARGET_BUILD_VARIANT)),true,false),'; \

	echo ''; \

	echo '    "DeviceName": "$(TARGET_DEVICE)",'; \

	echo '    "DeviceArch": "$(TARGET_ARCH)",'; \