diff --git a/java/res/values-ca/strings-action-keys.xml b/java/res/values-ca/strings-action-keys.xml
index cd8b9e7..59f72cc 100644
--- a/java/res/values-ca/strings-action-keys.xml
+++ b/java/res/values-ca/strings-action-keys.xml
@@ -20,7 +20,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="label_go_key" msgid="4033615332628671065">"Vés"</string>
+    <string name="label_go_key" msgid="4033615332628671065">"Ves"</string>
     <string name="label_next_key" msgid="5586407279258592635">"Seg."</string>
     <string name="label_previous_key" msgid="1421141755779895275">"Ant."</string>
     <string name="label_done_key" msgid="7564866296502630852">"Fet"</string>
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index ced838e..c2b2eda 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -31,7 +31,7 @@
     <string name="settings_screen_appearance" msgid="7358046399111611615">"Aspecto y diseño"</string>
     <string name="settings_screen_gesture" msgid="8826372746901183556">"Escritura gestual"</string>
     <string name="settings_screen_correction" msgid="1616818407747682955">"Corrección ortográfica"</string>
-    <string name="settings_screen_advanced" msgid="7472408607625972994">"Ajustes avanzados"</string>
+    <string name="settings_screen_advanced" msgid="7472408607625972994">"Opciones avanzadas"</string>
     <string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
     <string name="enable_split_keyboard" msgid="4177264923999493614">"Habilitar teclado dividido"</string>
     <string name="cloud_sync_title" msgid="8579271074443847055">"Sincronización del Teclado de Google"</string>
diff --git a/java/res/values-eu/strings.xml b/java/res/values-eu/strings.xml
index b63d83e..ede418f 100644
--- a/java/res/values-eu/strings.xml
+++ b/java/res/values-eu/strings.xml
@@ -142,7 +142,7 @@
     <string name="button_default" msgid="3988017840431881491">"Lehenetsia"</string>
     <string name="setup_welcome_title" msgid="6112821709832031715">"Ongi etorri <xliff:g id="APPLICATION_NAME">%s</xliff:g> aplikaziora"</string>
     <string name="setup_welcome_additional_description" msgid="8150252008545768953">"Idazketa lerrakorrarekin"</string>
-    <string name="setup_start_action" msgid="8936036460897347708">"Hasi erabiltzen"</string>
+    <string name="setup_start_action" msgid="8936036460897347708">"Lehen urratsak"</string>
     <string name="setup_next_action" msgid="371821437915144603">"Hurrengo urratsa"</string>
     <string name="setup_steps_title" msgid="6400373034871816182">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> konfiguratzen"</string>
     <string name="setup_step1_title" msgid="3147967630253462315">"Gaitu <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
diff --git a/java/res/values-iw/strings-emoji-descriptions.xml b/java/res/values-iw/strings-emoji-descriptions.xml
index ff468bd..0817b59 100644
--- a/java/res/values-iw/strings-emoji-descriptions.xml
+++ b/java/res/values-iw/strings-emoji-descriptions.xml
@@ -545,7 +545,7 @@
     <string name="spoken_emoji_1F3EB" msgid="7010966528205150525">"בית ספר"</string>
     <string name="spoken_emoji_1F3EC" msgid="4845978861878295154">"חנות כלבו"</string>
     <string name="spoken_emoji_1F3ED" msgid="3980316226665215370">"מפעל"</string>
-    <string name="spoken_emoji_1F3EE" msgid="1253964276770550248">"בר יפני"</string>
+    <string name="spoken_emoji_1F3EE" msgid="1253964276770550248">"פאב יפני"</string>
     <string name="spoken_emoji_1F3EF" msgid="1128975573507389883">"טירה יפנית"</string>
     <string name="spoken_emoji_1F3F0" msgid="1544632297502291578">"טירה אירופאית"</string>
     <!-- no translation found for spoken_emoji_1F3F3 (6471977885401554862) -->
diff --git a/java/res/values-my/strings.xml b/java/res/values-my/strings.xml
index 0e3fcd9..1ea4d02 100644
--- a/java/res/values-my/strings.xml
+++ b/java/res/values-my/strings.xml
@@ -132,7 +132,7 @@
     <string name="keyboard_layout_set" msgid="4309233698194565609">"အဆင်အပြင်"</string>
     <string name="custom_input_style_note_message" msgid="8826731320846363423">"သင့်စိတ်ကြိုက် ထည့်သွင်းမှုစတိုင်လ်အား စတင် အသုံးမပြုမှီ ဖွင့်ရပါမည်။ ၎င်းအားယခု ဖွင့်လိုပါသလား?"</string>
     <string name="enable" msgid="5031294444630523247">"ဖွင့်ရန်"</string>
-    <string name="not_now" msgid="6172462888202790482">"ယခုမလုပ်ပါ"</string>
+    <string name="not_now" msgid="6172462888202790482">"ယခု မဟုတ်"</string>
     <string name="custom_input_style_already_exists" msgid="8008728952215449707">"တူညီသည့် ထည့်သွင်းရန် စတိုင်လ် ရှိပြီးဖြစ်: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
     <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"ခလုတ်နှိပ်တုန်ခါမှု ကြာမြင့်ချိန်"</string>
     <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"ခလုတ်နှိပ်သည့် အသံအတိုးကျယ်"</string>
diff --git a/java/res/values-zh-rHK/strings-emoji-descriptions.xml b/java/res/values-zh-rHK/strings-emoji-descriptions.xml
index 61f519a..a743e38 100644
--- a/java/res/values-zh-rHK/strings-emoji-descriptions.xml
+++ b/java/res/values-zh-rHK/strings-emoji-descriptions.xml
@@ -1138,7 +1138,7 @@
     <string name="spoken_emoji_1F6AB" msgid="5313946262888343544">"禁止進入標誌"</string>
     <string name="spoken_emoji_1F6AC" msgid="6946858177965948288">"吸煙區符號"</string>
     <string name="spoken_emoji_1F6AD" msgid="6320088669185507241">"禁煙符號"</string>
-    <string name="spoken_emoji_1F6AE" msgid="1062469925352817189">"正確丟棄垃圾標誌"</string>
+    <string name="spoken_emoji_1F6AE" msgid="1062469925352817189">"正確捨棄垃圾標誌"</string>
     <string name="spoken_emoji_1F6AF" msgid="2286668056123642208">"請勿亂丟垃圾標誌"</string>
     <string name="spoken_emoji_1F6B0" msgid="179424763882990952">"飲用水標誌"</string>
     <string name="spoken_emoji_1F6B1" msgid="5585212805429161877">"非飲用水標誌"</string>
diff --git a/tests/Android.mk b/tests/Android.mk
index 12d9cbe..998c1de 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,8 +26,9 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target-minus-junit4 \
-    legacy-android-test
+    mockito-target-minus-junit4
+
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)