diff --git a/UI/TiltAnalogSettingsScreen.cpp b/UI/TiltAnalogSettingsScreen.cpp
index 5fedd197e7..a2e3649cd1 100644
--- a/UI/TiltAnalogSettingsScreen.cpp
+++ b/UI/TiltAnalogSettingsScreen.cpp
@@ -1,3 +1,20 @@
+// Copyright (c) 2013- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
 #include "TiltAnalogSettingsScreen.h"
 #include "Core/Config.h"
 #include "Core/System.h"
@@ -32,7 +49,7 @@ void TiltAnalogSettingsScreen::CreateViews() {
 	settings->Add(calibrate);
 
 	root_->Add(settings);
-};
+}
 
 void TiltAnalogSettingsScreen::update(InputState &input) {
 	UIScreen::update(input);
@@ -42,12 +59,12 @@ void TiltAnalogSettingsScreen::update(InputState &input) {
 	//If needed, we can add a "swap x and y" option. 
 	currentTiltX_ = input.acc.y;
 	currentTiltY_ = input.acc.x;
-};
+}
 
 UI::EventReturn TiltAnalogSettingsScreen::OnCalibrate(UI::EventParams &e) {
 	g_Config.fTiltBaseX = currentTiltX_;
 	g_Config.fTiltBaseY = currentTiltY_;
 
 	return UI::EVENT_DONE;
-};
+}
 
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 62b2906aab..f0cd2c3505 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -28,8 +28,8 @@ include $(LOCAL_PATH)/Locals.mk
 
 # http://software.intel.com/en-us/articles/getting-started-on-optimizing-ndk-project-for-multiple-cpu-architectures
 
-ifeq ($(TARGET_ARCH_ABI),x86) 
-
+ifeq ($(TARGET_ARCH_ABI),x86)
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_M_IX86
 ARCH_FILES := \
   $(SRC)/Common/ABI.cpp \
   $(SRC)/Common/x64Emitter.cpp \
@@ -47,7 +47,7 @@ ARCH_FILES := \
 endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI_V7A -DARMV7
 ARCH_FILES := \
   $(SRC)/Common/ArmEmitter.cpp \
   $(SRC)/Common/ArmCPUDetect.cpp \
@@ -66,7 +66,7 @@ ARCH_FILES := \
 endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi)
-
+LOCAL_CFLAGS := $(LOCAL_CFLAGS) -DARM -DARMEABI -march=armv6
 ARCH_FILES := \
   $(SRC)/Common/ArmEmitter.cpp \
   $(SRC)/Common/ArmCPUDetect.cpp \
@@ -206,9 +206,9 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Core/HLE/HLETables.cpp \
   $(SRC)/Core/HLE/HLE.cpp \
   $(SRC)/Core/HLE/sceAtrac.cpp \
-  $(SRC)/Core/HLE/__sceAudio.cpp \
-  $(SRC)/Core/HLE/sceAudio.cpp \
-  $(SRC)/Core/HLE/sceAudiocodec.cpp \
+  $(SRC)/Core/HLE/__sceAudio.cpp.arm \
+  $(SRC)/Core/HLE/sceAudio.cpp.arm \
+  $(SRC)/Core/HLE/sceAudiocodec.cpp.arm \
   $(SRC)/Core/HLE/sceChnnlsv.cpp \
   $(SRC)/Core/HLE/sceCcc.cpp \
   $(SRC)/Core/HLE/sceCtrl.cpp \
diff --git a/native b/native
index 416cff372c..2b63ad24ca 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 416cff372c45a418a2513674575cf442dcdb2049
+Subproject commit 2b63ad24ca99e5c6ec483ccaa25ce6c19e8d5af1