diff --git a/.gitignore b/.gitignore
index 57f1396be4..d192e26aef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,4 +47,5 @@ profile
 **/CodeBlocks/obj
 **/CodeBlocks/*.depend
 **/CodeBlocks/*.layout
+**/Builds/AndroidStudio
 doxygen/doc
diff --git a/examples/Demo/Builds/Android/build.xml b/examples/Demo/Builds/Android/build.xml
index 125d223b5a..b37451f9f5 100644
--- a/examples/Demo/Builds/Android/build.xml
+++ b/examples/Demo/Builds/Android/build.xml
@@ -17,7 +17,7 @@
     <condition property="ndkDebugValue" value="NDK_DEBUG=1" else="NDK_DEBUG=0">
       <equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
     </condition>
-    <condition property="app_abis" value="armeabi armeabi-v7a" else="armeabi armeabi-v7a">
+    <condition property="app_abis" value="armeabi x86" else="armeabi armeabi-v7a x86">
       <equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
     </condition>
     <exec executable="${ndk.dir}/ndk-build" dir="${basedir}" failonerror="true">
diff --git a/examples/Demo/Builds/Android/jni/Application.mk b/examples/Demo/Builds/Android/jni/Application.mk
index a54bacfb8b..90707b1855 100644
--- a/examples/Demo/Builds/Android/jni/Application.mk
+++ b/examples/Demo/Builds/Android/jni/Application.mk
@@ -7,7 +7,7 @@ APP_PLATFORM := android-10
 NDK_TOOLCHAIN_VERSION := 4.8
 
 ifeq ($(NDK_DEBUG),1)
-    APP_ABI := armeabi armeabi-v7a
+    APP_ABI := armeabi x86
 else
-    APP_ABI := armeabi armeabi-v7a
+    APP_ABI := armeabi armeabi-v7a x86
 endif
diff --git a/examples/MidiTest/Builds/Android/src/com/yourcompany/miditest/MidiTest.java b/examples/MidiTest/Builds/Android/src/com/yourcompany/miditest/MidiTest.java
index bff87ce765..92c5da47f7 100644
--- a/examples/MidiTest/Builds/Android/src/com/yourcompany/miditest/MidiTest.java
+++ b/examples/MidiTest/Builds/Android/src/com/yourcompany/miditest/MidiTest.java
@@ -1134,7 +1134,7 @@ public class MidiTest   extends Activity
 
                         try
                         {
-                            instrumentation.sendKeyDownUpSync (KeyEvent.KEYCODE_BREAK);
+                            instrumentation.sendKeyDownUpSync (KeyEvent.KEYCODE_UNKNOWN);
                         }
                         catch (Exception e)
                         {