Merge commit 'remotes/korg/cupcake' into cupcake_to_master
diff --git a/Android.mk b/Android.mk
index 4e6f042..ba187a6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,3 @@
 ifneq ($(TARGET_SIMULATOR),true)
-ifeq ($(TARGET_ARCH), x86)
 include $(call all-subdir-makefiles)
 endif
-endif