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-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-sw/strings-talkback-descriptions.xml b/java/res/values-sw/strings-talkback-descriptions.xml
index a22ff87..b4943aa 100644
--- a/java/res/values-sw/strings-talkback-descriptions.xml
+++ b/java/res/values-sw/strings-talkback-descriptions.xml
@@ -59,7 +59,7 @@
     <string name="keyboard_mode_date" msgid="6597407244976713364">"tarehe"</string>
     <string name="keyboard_mode_date_time" msgid="3642804408726668808">"tarehe na wakati"</string>
     <string name="keyboard_mode_email" msgid="1239682082047693644">"barua pepe"</string>
-    <string name="keyboard_mode_im" msgid="3812086215529493501">"kutuma ujumbe"</string>
+    <string name="keyboard_mode_im" msgid="3812086215529493501">"utumaji ujumbe"</string>
     <string name="keyboard_mode_number" msgid="5395042245837996809">"nambari"</string>
     <string name="keyboard_mode_phone" msgid="2486230278064523665">"simu"</string>
     <string name="keyboard_mode_text" msgid="9138789594969187494">"maandishi"</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)