Merge "Mark Theme name text as translatable="false"" into lmp-dev
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 72f8f87..8be4d78 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -34,6 +34,12 @@
# To suppress compiler warnings for unused variables/functions used for debug features etc.
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
+# HACK: -mstackrealign is required for x86 builds running on pre-KitKat devices to avoid crashes
+# with SSE instructions.
+ifeq ($(TARGET_ARCH), x86)
+ LOCAL_CFLAGS += -mstackrealign
+endif # x86
+
include $(LOCAL_PATH)/NativeFileList.mk
LOCAL_SRC_FILES := \