Update GmsCore

GmsCore/Android.mk

@@ -2,9 +2,10 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := GmsCore
-LOCAL_SRC_FILES := com.google.android.gms-9258259.apk
-LOCAL_REQUIRED_MODULES := libvtm-jni libvtm-android
+LOCAL_SRC_FILES := com.google.android.gms-10545440.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)
@@ -23,6 +24,8 @@ 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
@@ -35,11 +38,3 @@ LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libvtm-android
-LOCAL_SRC_FILES := lib/$(arch)/libvtm-android.so
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-include $(BUILD_PREBUILT)
-