Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: If68565edc37f9a7c05edc557edd8ece69c9f31d3
diff --git a/pylib/gyp/generator/android.py b/pylib/gyp/generator/android.py
index b7ea9ea..0149c27 100644
--- a/pylib/gyp/generator/android.py
+++ b/pylib/gyp/generator/android.py
@@ -85,8 +85,8 @@
     'bionic/libc/arch-arm/include',
     'bionic/libc/include',
     'bionic/libstdc++/include',
-    'bionic/libc/kernel/common',
-    'bionic/libc/kernel/arch-arm',
+    'bionic/libc/kernel/uapi',
+    'bionic/libc/kernel/uapi/asm-arm',
     'bionic/libm/include',
     'bionic/libm/include/arm',
     'bionic/libthread_db/include',