diff --git a/Android.mk b/Android.mk
index 5a69fec..f0b1fa7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -114,7 +114,6 @@
 	$(LOCAL_PATH)/unix/src
 
 LOCAL_SHARED_LIBRARIES := \
-	libandroid_runtime \
 	libnativehelper \
 	libutils \
 	liblog \
diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp
index 9a32ceb..3744c49 100644
--- a/FaceDetector_jni.cpp
+++ b/FaceDetector_jni.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -27,7 +28,6 @@
 
 #include "jni.h"
 #include "JNIHelp.h"
-#include "android_runtime/AndroidRuntime.h"
 
 using namespace android;
 
@@ -288,8 +288,7 @@
 
 int register_android_media_FaceDetector(JNIEnv *_env)
 {
-    return android::AndroidRuntime::registerNativeMethods(
-            _env, classPathName, methods, NELEM(methods));
+    return jniRegisterNativeMethods(_env, classPathName, methods, NELEM(methods));
 }
 
 // ---------------------------------------------------------------------------