Make sure we use xmp_toolkit from external instead of the precompiled JAR.

 Bug: 7400527

Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155
diff --git a/Android.mk b/Android.mk
index fd1d4e4..a5efe55 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
-LOCAL_STATIC_JAVA_LIBRARIES += libXMPCore
+LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)