Revert^2 "Conditionally pass kernel version to build.prop"

ff77e222131c0c79bce658ea658afa4d6f2ba673

Change-Id: I846175bb9dc2b0e000fc39c7faf2e24167b4a513
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 72ee2e4..1d35337 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -346,6 +346,11 @@
 $(call add_json_bool, ArtTargetIncludeDebugBuild, $(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD))
 endif
 
+_config_enable_uffd_gc := \
+  $(firstword $(OVERRIDE_ENABLE_UFFD_GC) $(PRODUCT_ENABLE_UFFD_GC) default)
+$(call add_json_str, EnableUffdGc, $(_config_enable_uffd_gc))
+_config_enable_uffd_gc :=
+
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))