diff --git a/java/Android.mk b/java/Android.mk
index 364973b..b580624 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -23,10 +23,7 @@
 
 LOCAL_CERTIFICATE := shared
 
-# We want to package libjni_latinime.so into the apk.
 LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
-# We want to install libjni_latinime.so to the system partition if LatinIME gets installed.
-LOCAL_REQUIRED_MODULES := libjni_latinime
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-common inputmethod-common android-support-v4
 
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index 3d09c05..aaf31c6 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -51,7 +51,7 @@
         $(USED_TARGETTED_UTILS)
 
 LOCAL_JAVA_LIBRARIES := junit
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LATINIME_HOST_NATIVE_LIBNAME)
+LOCAL_REQUIRED_MODULES := $(LATINIME_HOST_NATIVE_LIBNAME)
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 LOCAL_MODULE := dicttool_aosp
 
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index a3d3c02..812e76c 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -21,8 +21,7 @@
 LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../..
 
 ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
-LOCAL_CFLAGS += -m64
-LOCAL_LDFLAGS += -m64
+LOCAL_MULTILIB := 64
 endif #HOST_JDK_IS_64BIT_VERSION
 
 LOCAL_CFLAGS += -DHOST_TOOL -fPIC