diff --git a/NativeCode.mk b/NativeCode.mk
index 79d6a60..379a1cb 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -117,6 +117,7 @@
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := libjavacore-unit-tests
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
+LOCAL_SHARED_LIBRARIES := libnativehelper
 LOCAL_CXX_STL := libc++
 include $(BUILD_NATIVE_TEST)
 
@@ -131,6 +132,7 @@
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := libjavacore-benchmarks
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
+LOCAL_SHARED_LIBRARIES := libnativehelper
 LOCAL_CXX_STL := libc++
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/dalvik/src/main/java/dalvik/system/DexPathList.java
index f0b1ffd..5552b1c 100644
--- a/dalvik/src/main/java/dalvik/system/DexPathList.java
+++ b/dalvik/src/main/java/dalvik/system/DexPathList.java
@@ -224,6 +224,15 @@
         return makeElements(files, null, suppressedExceptions, true);
     }
 
+    /*
+     * TODO (dimitry): Revert after GMS core stops relying on the existence of this
+     * method (see b/21957414 for details)
+     */
+    private static Element[] makePathElements(List<File> files, File optimizedDirectory,
+                                              List<IOException> suppressedExceptions) {
+        return makeElements(files, null, suppressedExceptions, true);
+    }
+
     private static Element[] makeElements(List<File> files, File optimizedDirectory,
                                           List<IOException> suppressedExceptions,
                                           boolean ignoreDexFiles) {