release-request-c72e46fd-06a9-4104-bad3-f7ba8aeb3e1d-for-git_oc-release-4029917 snap-temp-L38800000066299680

Change-Id: I86b4d52c2306a5e815ce111cc5a205e8b645a199
diff --git a/java/Android.mk b/java/Android.mk
index b84b347..154f3a2 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -26,7 +26,12 @@
 LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common inputmethod-common android-support-v4 jsr305 latinime-common
+        android-common inputmethod-common jsr305 latinime-common
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+        android-support-v4
+
+LOCAL_USE_AAPT2 := true
 
 # Do not compress dictionary files to mmap dict data runtime
 LOCAL_AAPT_FLAGS := -0 .dict