diff --git a/Android.mk b/Android.mk
index 8456cc90a..717ce85a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,11 @@
-# This is the Android makefile for libyuv so that we can
-# build it with the Android NDK.
-ifneq ($(TARGET_ARCH),x86)
+# This is the Android makefile for libyuv for both platform and NDK.
+LOCAL_PATH:= $(call my-dir)
 
-LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
 
-common_SRC_FILES := \
+LOCAL_CPP_EXTENSION := .cc
+
+LOCAL_SRC_FILES := \
     source/compare.cc \
     source/convert.cc \
     source/convert_from.cc \
@@ -16,33 +17,19 @@ common_SRC_FILES := \
     source/row_posix.cc \
     source/scale.cc \
     source/scale_argb.cc \
-    source/video_common.cc \
-    source/rotate_neon.cc \
-    source/row_neon.cc
+    source/video_common.cc
 
-common_CFLAGS := -Wall -fexceptions -DHAVE_ARMEABI_V7A=1 -mfloat-abi=softfp -mfpu=neon
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_CFLAGS += -DLIBYUV_NEON
+    LOCAL_SRC_FILES += \
+        source/rotate_neon.cc.neon \
+        source/row_neon.cc.neon
+endif
 
-common_C_INCLUDES = $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
 
-# For the device
-# =====================================================
-# Device static library
-
-include $(CLEAR_VARS)
-
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_NDK_VERSION := 5
-LOCAL_SDK_VERSION := 9
-LOCAL_NDK_STL_VARIANT := stlport_static
-
-LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_C_INCLUDES += $(common_C_INCLUDES)
-
-LOCAL_MODULE:= libyuv_static
+LOCAL_MODULE := libyuv_static
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_STATIC_LIBRARY)
 
-endif
diff --git a/README.chromium b/README.chromium
index 3df725107..788705939 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 389
+Version: 390
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index c8fdd5961..5364b115a 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -111,7 +111,7 @@ extern "C" {
 #endif
 
 // The following are available on Neon platforms
-#if !defined(YUV_DISABLE_ASM) && defined(__ARM_NEON__)
+#if !defined(YUV_DISABLE_ASM) && (defined(__ARM_NEON__) || defined(LIBYUV_NEON))
 #define HAS_MIRRORROW_NEON
 #define HAS_MIRRORROWUV_NEON
 #define HAS_SPLITUV_NEON
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index aecdd8677..ed0a2d5fa 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 389
+#define LIBYUV_VERSION 390
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT