diff --git a/src/common_video/libyuv/Android.mk b/src/common_video/libyuv/Android.mk
index 4c634ad32..90f6250dc 100644
--- a/src/common_video/libyuv/Android.mk
+++ b/src/common_video/libyuv/Android.mk
@@ -13,12 +13,12 @@ include $(CLEAR_VARS)
 include $(LOCAL_PATH)/../../../android-webrtc.mk
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_libyuv
+LOCAL_MODULE := libwebrtc_yuv
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
     libyuv.cc \
-    scaler.cc \
+    scaler.cc
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
@@ -26,7 +26,10 @@ LOCAL_CFLAGS := \
 
 # Include paths placed before CFLAGS/CPPFLAGS
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include 
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../../../.. \
+    $(LOCAL_PATH)/../../../../libyuv/files/include
+
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/common_video/libyuv/libyuv.cc b/src/common_video/libyuv/libyuv.cc
index eea773cb1..83d2aed21 100644
--- a/src/common_video/libyuv/libyuv.cc
+++ b/src/common_video/libyuv/libyuv.cc
@@ -13,7 +13,11 @@
 #include <assert.h>
 
 // LibYuv includes
+#ifdef WEBRTC_ANDROID
+#include "libyuv/files/include/libyuv.h"
+#else
 #include "third_party/libyuv/include/libyuv.h"
+#endif
 
 namespace webrtc {
 
diff --git a/src/common_video/libyuv/scaler.cc b/src/common_video/libyuv/scaler.cc
index 1d0020419..a12462c57 100644
--- a/src/common_video/libyuv/scaler.cc
+++ b/src/common_video/libyuv/scaler.cc
@@ -11,7 +11,11 @@
 #include "common_video/libyuv/include/scaler.h"
 
 // LibYuv
+#ifdef WEBRTC_ANDROID
+#include "libyuv/files/include/libyuv.h"
+#else
 #include "third_party/libyuv/include/libyuv.h"
+#endif
 
 namespace webrtc {