Merge "Fix discrepancy in SANITIZE_TARGET format with soong."

diff --cc core/soong.mk
index cb0a0d0,65180d7..3f0ee85
--- 1/core/soong.mk
--- 2/core/soong.mk
+++ b/core/soong.mk
@@@ -46,12 -39,9 +46,12 @@@ $(SOONG_VARIABLES): FORC
        echo '    "Brillo": $(if $(BRILLO),true,false),'; \
        echo '    "Malloc_not_svelte": $(if $(filter true,$(MALLOC_SVELTE)),false,true),'; \
        echo '    "Allow_missing_dependencies": $(if $(TARGET_BUILD_APPS)$(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),true,false),'; \
-       echo '    "SanitizeHost": [$(if $(SANITIZE_HOST),"$(subst $(comma),"$(comma)",$(SANITIZE_HOST))")],'; \
-       echo '    "SanitizeDevice": [$(if $(SANITIZE_TARGET),"$(subst $(comma),"$(comma)",$(SANITIZE_TARGET))")],'; \
+       echo '    "SanitizeHost": [$(if $(SANITIZE_HOST),"$(subst $(space),"$(comma)",$(SANITIZE_HOST))")],'; \
+       echo '    "SanitizeDevice": [$(if $(SANITIZE_TARGET),"$(subst $(space),"$(comma)",$(SANITIZE_TARGET))")],'; \
        echo '    "HostStaticBinaries": $(if $(strip $(BUILD_HOST_static)),true,false),'; \
 +      echo '    "Cpusets": $(if $(strip $(ENABLE_CPUSETS)),true,false),'; \
 +      echo '    "Schedboost": $(if $(strip $(ENABLE_SCHEDBOOST)),true,false),'; \
 +      echo '    "Binder32bit": $(if $(BINDER32BIT),true,false),'; \
        echo ''; \
        echo '    "DeviceName": "$(TARGET_DEVICE)",'; \
        echo '    "DeviceArch": "$(TARGET_ARCH)",'; \