diff --git a/Android.mk b/Android.mk
index a98bedc..e4cc5c0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -487,14 +487,28 @@
   lib/bootstrap/libdl.so \
   lib64/bootstrap/libc.so \
   lib64/bootstrap/libm.so \
-  lib64/bootstrap/libdl.so 
+  lib64/bootstrap/libdl.so \
 
-.PHONY: art-bionic-files
-art-bionic-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker
+PRIVATE_RUNTIME_DEPENDENCY_LIBS := \
+  lib/libnativebridge.so \
+  lib64/libnativebridge.so \
+  lib/libnativehelper.so \
+  lib64/libnativehelper.so \
+  lib/libdexfile_external.so \
+  lib64/libdexfile_external.so \
+  lib/libnativeloader.so \
+  lib64/libnativeloader.so \
+
+.PHONY: standalone-apex-files
+standalone-apex-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker com.android.runtime.debug
 	for f in $(PRIVATE_BIONIC_FILES); do \
 	  tf=$(TARGET_OUT)/$$f; \
 	  if [ -f $$tf ]; then cp -f $$tf $$(echo $$tf | sed 's,bootstrap/,,'); fi; \
 	done
+	for f in $(PRIVATE_RUNTIME_DEPENDENCY_LIBS); do \
+	  tf=$(TARGET_OUT)/../apex/com.android.runtime.debug/$$f; \
+	  if [ -f $$tf ]; then cp -f $$tf $(TARGET_OUT)/$$f; fi; \
+	done
 
 ########################################################################
 # Phony target for only building what go/lem requires for pushing ART on /data.
@@ -529,7 +543,7 @@
                         $(TARGET_CORE_IMG_OUT_BASE)-interpreter.art \
                         libc.bootstrap libdl.bootstrap libm.bootstrap \
                         icu-data-art-test \
-                        art-bionic-files
+                        standalone-apex-files
 	# remove debug libraries from public.libraries.txt because golem builds
 	# won't have it.
 	sed -i '/libartd.so/d' $(TARGET_OUT)/etc/public.libraries.txt