diff --git a/java/res/values-bs/strings.xml b/java/res/values-bs/strings.xml
index 50395f0..8d47af9 100644
--- a/java/res/values-bs/strings.xml
+++ b/java/res/values-bs/strings.xml
@@ -100,7 +100,7 @@
     <string name="account_selected" msgid="2846876462199625974">"Trenutno koristite račun <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
     <string name="account_select_ok" msgid="9141195141763227797">"Uredu"</string>
     <string name="account_select_cancel" msgid="5181012062618504340">"Otkaži"</string>
-    <string name="account_select_sign_out" msgid="3299651159390187933">"Odjava"</string>
+    <string name="account_select_sign_out" msgid="3299651159390187933">"Odjavi me"</string>
     <string name="account_select_title" msgid="6279711684772922649">"Odaberite račun koji ćete koristiti"</string>
     <string name="subtype_en_GB" msgid="88170601942311355">"engleski (UK)"</string>
     <string name="subtype_en_US" msgid="6160452336634534239">"engleski (SAD)"</string>
@@ -140,7 +140,7 @@
     <string name="prefs_enable_emoji_alt_physical_key" msgid="5963640002335470112">"Emoji za fizičku tastaturu"</string>
     <string name="prefs_enable_emoji_alt_physical_key_summary" msgid="5259484820941627827">"Tipka Alt na fizičkoj tastaturi aktivira paletu za emoji"</string>
     <string name="button_default" msgid="3988017840431881491">"Zadano"</string>
-    <string name="setup_welcome_title" msgid="6112821709832031715">"Dobro došli u aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_welcome_title" msgid="6112821709832031715">"Dobrodošli u aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="setup_welcome_additional_description" msgid="8150252008545768953">"s kucanjem pokretima"</string>
     <string name="setup_start_action" msgid="8936036460897347708">"Započnite"</string>
     <string name="setup_next_action" msgid="371821437915144603">"Sljedeći korak"</string>
@@ -153,7 +153,7 @@
     <string name="setup_step2_instruction" msgid="9141481964870023336">"Zatim odaberite aplikaciju \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" kao vaš aktivni način unosa teksta."</string>
     <string name="setup_step2_action" msgid="1660330307159824337">"Zamijeni načine unosa"</string>
     <string name="setup_step3_title" msgid="3154757183631490281">"Odlično, sve je spremno!"</string>
-    <string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete upisivati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
+    <string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete kucati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
     <string name="setup_step3_action" msgid="600879797256942259">"Konfiguriraj dodatne jezike"</string>
     <string name="setup_finish_action" msgid="276559243409465389">"Završeno"</string>
     <string name="show_setup_wizard_icon" msgid="5008028590593710830">"Prikaži ikonu aplikacije"</string>
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index 77ec50e..4d75ffa 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -86,7 +86,7 @@
     <string name="gesture_space_aware" msgid="2078291600664682496">"Gest de frase"</string>
     <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Per afegir espais als gestos, apropa el dit a la tecla d\'espai"</string>
     <string name="voice_input" msgid="3583258583521397548">"Tecla d\'entrada de veu"</string>
-    <string name="voice_input_disabled_summary" msgid="6323489602945135165">"No hi ha cap mètode d\'introducció de veu activat. Comprova la configuració d\'Idioma i introducció de text."</string>
+    <string name="voice_input_disabled_summary" msgid="6323489602945135165">"No hi ha cap mètode d\'entrada de veu activat. Comprova la configuració d\'Idioma i introducció de text."</string>
     <string name="configure_input_method" msgid="373356270290742459">"Configura mètodes d\'introducció"</string>
     <string name="language_selection_title" msgid="3666971864764478269">"Idiomes"</string>
     <string name="help_and_feedback" msgid="5328219371839879161">"Ajuda i suggeriments"</string>
@@ -147,7 +147,7 @@
     <string name="setup_steps_title" msgid="6400373034871816182">"S\'està configurant <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="setup_step1_title" msgid="3147967630253462315">"Activa <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="setup_step1_instruction" msgid="4295448056733329661">"Marca <xliff:g id="APPLICATION_NAME">%s</xliff:g> a la configuració d\'Idioma i introducció de text. D\'aquesta manera, es podrà executar al dispositiu."</string>
-    <string name="setup_step1_finished_instruction" msgid="8701441895377434947">"L\'aplicació <xliff:g id="APPLICATION_NAME">%s</xliff:g> ja està activada a la configuració d\'Idioma i introducció de text. Ves al pas següent."</string>
+    <string name="setup_step1_finished_instruction" msgid="8701441895377434947">"L\'aplicació <xliff:g id="APPLICATION_NAME">%s</xliff:g> ja està activada a la configuració d\'Idioma i introducció de text. Vés al pas següent."</string>
     <string name="setup_step1_action" msgid="4366513534999901728">"Activa a la configuració"</string>
     <string name="setup_step2_title" msgid="6860725447906690594">"Canvi a <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="setup_step2_instruction" msgid="9141481964870023336">"A continuació, selecciona \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" com a mètode d\'introducció de text actiu."</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-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-pt-rPT/strings-emoji-descriptions.xml b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
index 6bc3dce..1096aac 100644
--- a/java/res/values-pt-rPT/strings-emoji-descriptions.xml
+++ b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
@@ -25,7 +25,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de Direitos de Autor"</string>
+    <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de direitos de autor"</string>
     <string name="spoken_emoji_00AE" msgid="7708335454134589027">"Símbolo de marca registada"</string>
     <string name="spoken_emoji_203C" msgid="153340916701508663">"Duplo ponto de exclamação"</string>
     <string name="spoken_emoji_2049" msgid="4877256448299555371">"Pontos de exclamação e de interrogação"</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)
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index 6852b82..4981629 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -16,12 +16,6 @@
 # Only build if it's explicitly requested, or running mm/mmm.
 ifneq ($(ONE_SHOT_MAKEFILE)$(filter $(MAKECMDGOALS),dicttool_aosp),)
 
-# HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11.
-LATINIME_HOST_OSNAME := $(shell uname -s)
-ifeq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this
-$(warning dicttool_aosp is not supported on $(LATINIME_HOST_OSNAME))
-else # TODO: Remove this
-
 LATINIME_DICTTOOL_AOSP_LOCAL_PATH := $(call my-dir)
 LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH)
 LATINIME_HOST_NATIVE_LIBNAME := liblatinime-aosp-dicttool-host
@@ -86,11 +80,8 @@
 include $(BUILD_HOST_JAVA_LIBRARY)
 include $(LOCAL_PATH)/etc/Android.mk
 
-endif # Darwin - TODO: Remove this
-
 # Clear our private variables
 LATINIME_DICTTOOL_AOSP_LOCAL_PATH :=
 LATINIME_LOCAL_DIR :=
-LATINIME_HOST_OSNAME :=
 
 endif
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index 622a9f1..510f18c 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -13,10 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11.
-LATINIME_HOST_OSNAME := $(shell uname -s)
-ifneq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -30,9 +26,6 @@
 endif #FLAG_DBG
 
 LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated -Wno-unused-parameter -Wno-unused-function
-ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
-LOCAL_MULTILIB := 64
-endif #HOST_JDK_IS_64BIT_VERSION
 
 LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni
 LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src
@@ -48,9 +41,6 @@
 
 include $(BUILD_HOST_SHARED_LIBRARY)
 
-endif # Darwin - TODO: Remove this
-
 # Clear our private variables
 include $(LOCAL_PATH)/$(LATINIME_NATIVE_JNI_DIR)/CleanupNativeFileList.mk
 LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../..
-LATINIME_HOST_OSNAME :=