Merge "Revert^2 "Add the Android Runtime APEX module to PRODUCT_PACKAGES.""
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index bda4524..6d835fd 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -51,6 +51,10 @@
PRODUCT_PACKAGES += art-runtime
# ART/dex helpers.
PRODUCT_PACKAGES += art-tools
+# Android Runtime APEX module.
+ifneq ($(DONT_INCLUDE_RUNTIME_APEX), true)
+ PRODUCT_PACKAGES += com.android.runtime
+endif
# Certificates.
PRODUCT_PACKAGES += \