diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index 305c244..0ac83ed 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -3,38 +3,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := GmsCore
 LOCAL_SRC_FILES := com.google.android.gms-11059462.apk
-LOCAL_REQUIRED_MODULES := libvtm-jni
 LOCAL_MODULE_CLASS := APPS
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 include $(BUILD_PREBUILT)
-
-# FIXME
-# TARGET_ARCH_ABI should be used, but it is not defined...
-ifeq "$(TARGET_ARCH)" "arm"
-  ifeq ($(findstring armv5te,$(TARGET_ARCH_VARIANT)),armv5te)
-    arch := armeabi
-  else ifeq ($(findstring armv7-a,$(TARGET_ARCH_VARIANT)),armv7-a)
-    arch := armeabi-v7a
-  else
-    arch := unknown
-  endif
-else ifeq "$(TARGET_ARCH)" "arm64"
-  arch := arm64-v8a
-else ifeq "$(TARGET_ARCH)" "x86"
-  arch := x86
-else ifeq "$(TARGET_ARCH)" "x86_64"
-  arch := x86_64
-else
-  arch := unknown
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libvtm-jni
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_SRC_FILES := lib/$(arch)/libvtm-jni.so
-include $(PREBUILT_SHARED_LIBRARY)
-
diff --git a/GmsCore/lib/arm64-v8a/libvtm-jni.so b/GmsCore/lib/arm64-v8a/libvtm-jni.so
deleted file mode 100644
index cfd2993..0000000
Binary files a/GmsCore/lib/arm64-v8a/libvtm-jni.so and /dev/null differ
diff --git a/GmsCore/lib/armeabi-v7a/libvtm-jni.so b/GmsCore/lib/armeabi-v7a/libvtm-jni.so
deleted file mode 100644
index 54308c2..0000000
Binary files a/GmsCore/lib/armeabi-v7a/libvtm-jni.so and /dev/null differ
diff --git a/GmsCore/lib/armeabi/libvtm-jni.so b/GmsCore/lib/armeabi/libvtm-jni.so
deleted file mode 100644
index 668145b..0000000
Binary files a/GmsCore/lib/armeabi/libvtm-jni.so and /dev/null differ
diff --git a/GmsCore/lib/x86/libvtm-jni.so b/GmsCore/lib/x86/libvtm-jni.so
deleted file mode 100644
index 133d12e..0000000
Binary files a/GmsCore/lib/x86/libvtm-jni.so and /dev/null differ
diff --git a/GmsCore/lib/x86_64/libvtm-jni.so b/GmsCore/lib/x86_64/libvtm-jni.so
deleted file mode 100644
index 24cd645..0000000
Binary files a/GmsCore/lib/x86_64/libvtm-jni.so and /dev/null differ