diff --git a/prepare_sources.sh b/prepare_sources.sh
index e7486f0a7..8149fc9e0 100755
--- a/prepare_sources.sh
+++ b/prepare_sources.sh
@@ -28,7 +28,8 @@ fi
 
 cd $topdir/submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo "iLBC prepare stage failed" ; exit 1 )
 
-cd $topdir/submodules/externals/libvpx && ./configure --target=armv7-android-gcc --sdk-path=$NDK_PATH --enable-error-concealment && make asm_com_offsets.asm || ( echo "VP8 prepare stage failed." ; exit 1 )
+cd $topdir/submodules/externals/build/libvpx && ./asm_conversion.sh && cp *.asm *.h ../../libvpx/
+cd $topdir/submodules/externals/libvpx && ./configure --target=armv7-android-gcc --sdk-path=$NDK_PATH --enable-error-concealment && make clean && make asm_com_offsets.asm || ( echo "VP8 prepare stage failed." ; exit 1 )
 
 cd $topdir/submodules/mssilk && ./autogen.sh && ./configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " && cd sdk && make extract-sources || ( echo "SILK audio plugin prepare state failed." ; exit 1 )
 
diff --git a/submodules/externals/build/libvpx/Android.mk b/submodules/externals/build/libvpx/Android.mk
index a093bc089..4bbe093d8 100755
--- a/submodules/externals/build/libvpx/Android.mk
+++ b/submodules/externals/build/libvpx/Android.mk
@@ -153,10 +153,12 @@ VP8_COMMON_SRCS += vp8/common/arm/armv6/iwalsh_v6$(ASM)
 VP8_COMMON_SRCS += vp8/common/arm/armv6/filter_v6$(ASM)
 VP8_COMMON_SRCS += vp8/common/arm/armv6/idct_v6$(ASM)
 VP8_COMMON_SRCS += vp8/common/arm/armv6/loopfilter_v6$(ASM)
-VP8_COMMON_SRCS += vp8/common/arm/armv6/recon_v6$(ASM)
+#VP8_COMMON_SRCS += vp8/common/arm/armv6/recon_v6$(ASM)
 VP8_COMMON_SRCS += vp8/common/arm/armv6/simpleloopfilter_v6$(ASM)
 VP8_COMMON_SRCS += vp8/common/arm/armv6/sixtappredict8x4_v6$(ASM)
 VP8_COMMON_SRCS += vp8/common/arm/armv6/idct_blk_v6.c
+VP8_COMMON_SRCS += vp8/common/arm/armv6/dequant_idct_v6$(ASM)
+VP8_COMMON_SRCS += vp8/common/arm/armv6/dequantize_v6$(ASM)
 
 # common (neon)
 VP8_COMMON_SRCS += vp8/common/arm/neon/bilinearpredict4x4_neon$(ASM).neon
@@ -172,16 +174,16 @@ VP8_COMMON_SRCS += vp8/common/arm/neon/loopfilter_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/loopfiltersimpleverticaledge_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/mbloopfilter_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/recon2b_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/recon4b_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/reconb_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/shortidct4x4llm_1_neon$(ASM).neon
+#VP8_COMMON_SRCS += vp8/common/arm/neon/recon2b_neon$(ASM).neon
+#VP8_COMMON_SRCS += vp8/common/arm/neon/recon4b_neon$(ASM).neon
+#VP8_COMMON_SRCS += vp8/common/arm/neon/reconb_neon$(ASM).neon
+#VP8_COMMON_SRCS += vp8/common/arm/neon/shortidct4x4llm_1_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/shortidct4x4llm_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict4x4_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict8x4_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict8x8_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/sixtappredict16x16_neon$(ASM).neon
-VP8_COMMON_SRCS += vp8/common/arm/neon/recon16x16mb_neon$(ASM).neon
+#VP8_COMMON_SRCS += vp8/common/arm/neon/recon16x16mb_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/buildintrapredictorsmby_neon$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/save_neon_reg$(ASM).neon
 VP8_COMMON_SRCS += vp8/common/arm/neon/dequant_idct_neon$(ASM).neon
@@ -194,9 +196,6 @@ VP8_COMMON_SRCS += vp8/common/arm/neon/idct_blk_neon.c.neon
 VP8_DX_SRCS = vp8/decoder/arm/arm_dsystemdependent.c
 
 #File list for armv6
-VP8_DX_SRCS += vp8/decoder/arm/armv6/dequant_dc_idct_v6$(ASM)
-VP8_DX_SRCS += vp8/decoder/arm/armv6/dequant_idct_v6$(ASM)
-VP8_DX_SRCS += vp8/decoder/arm/armv6/dequantize_v6$(ASM)
 
 
 ### vp8dx
diff --git a/submodules/externals/build/libvpx/cpu-features.h b/submodules/externals/build/libvpx/cpu-features.h
new file mode 100644
index 000000000..e6a7db71a
--- /dev/null
+++ b/submodules/externals/build/libvpx/cpu-features.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef CPU_FEATURES_H
+#define CPU_FEATURES_H
+
+#include <sys/cdefs.h>
+#include <stdint.h>
+
+__BEGIN_DECLS
+
+typedef enum {
+    ANDROID_CPU_FAMILY_UNKNOWN = 0,
+    ANDROID_CPU_FAMILY_ARM,
+    ANDROID_CPU_FAMILY_X86,
+
+    ANDROID_CPU_FAMILY_MAX  /* do not remove */
+
+} AndroidCpuFamily;
+
+/* Return family of the device's CPU */
+extern AndroidCpuFamily   android_getCpuFamily(void);
+
+enum {
+    ANDROID_CPU_ARM_FEATURE_ARMv7 = (1 << 0),
+    ANDROID_CPU_ARM_FEATURE_VFPv3 = (1 << 1),
+    ANDROID_CPU_ARM_FEATURE_NEON  = (1 << 2),
+};
+
+extern uint64_t    android_getCpuFeatures(void);
+
+__END_DECLS
+
+#endif /* CPU_FEATURES_H */