Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
diff --git a/GypAndroid.linux-mips.mk b/GypAndroid.linux-mips.mk
index bbec4cf..07ae768 100644
--- a/GypAndroid.linux-mips.mk
+++ b/GypAndroid.linux-mips.mk
@@ -209,6 +209,7 @@
 include $(LOCAL_PATH)/ui/ui.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/ui_jni_headers.target.linux-mips.mk
 include $(LOCAL_PATH)/ui/ui_resources.target.linux-mips.mk
+include $(LOCAL_PATH)/ui/window_open_disposition_java.target.linux-mips.mk
 include $(LOCAL_PATH)/url/url_lib.target.linux-mips.mk
 include $(LOCAL_PATH)/v8/tools/gyp/js2c.host.linux-mips.mk
 include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk