Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I5f7a18f535eb0f027e87ab78b532cbf97cc7427f
diff --git a/Android.mk b/Android.mk
index 4af69ea..1098a40 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
   -Wno-unused-parameter \
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/src \
-                    external/chromium_org/v8 \
+                    $(TARGET_OUT_HEADERS)/chromium_org \
                     external/chromium_org/src/v8 \
 
 # Depend on V8 from WebView