Snap for 6091606 from 3f47343af243f81c2497abf48a8b16333cff8712 to rvc-release Change-Id: Id18b70b76361e55f68a1cac06a07c342e0ce186f

diff --git a/fuchsia.mk b/fuchsia.mk
index 7009943..81338f0 100644
--- a/fuchsia.mk
+++ b/fuchsia.mk

@@ -27,19 +27,26 @@
 # default is nosdcard, S/W button enabled in resource
 PRODUCT_CHARACTERISTICS := nosdcard
 
+art_apex := com.android.art.release
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+    art_apex := com.android.art.debug
+endif
+
 # Hand-picked packages.
 PRODUCT_PACKAGES += \
     art-runtime \
-    bouncycastle \
-    conscrypt \
-    core-icu4j \
-    core-libart \
-    core-oj \
-    dalvikvm \
-    libart \
-    libjavacore \
-    libopenjdk \
-    okhttp
+    bouncycastle.$(art_apex) \
+    conscrypt.com.android.conscrypt \
+    core-icu4j.$(art_apex) \
+    core-libart.$(art_apex) \
+    core-oj.$(art_apex) \
+    dalvikvm.$(art_apex) \
+    libart.$(art_apex) \
+    libjavacore.$(art_apex) \
+    libopenjdk.$(art_apex) \
+    okhttp.$(art_apex)
+
+art_apex :=
 
 # Fuchsia only has 64-bit support.
 TARGET_SUPPORTS_32_BIT_APPS := false