Update from https://crrev.com/316786

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 021a7a04f2498077cb6b2407861df0365d460578..33dfa37e6c2a33f3a31da77494c5a227540b2976 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -345,6 +345,11 @@ template("java_cpp_enum") {
   assert(defined(invoker.outputs))
 
   action("${target_name}__generate_enum") {
+    # The sources aren't compiled so don't check their dependencies.
+    # TODO(brettw) uncomment after GN binary rolled pas 314974 (which added
+    # support for this value on actions).
+    #check_includes = false
+
     sources = invoker.sources
     script = "//build/android/gyp/java_cpp_enum.py"
     gen_dir = "${target_gen_dir}/${target_name}/enums"
@@ -998,6 +1003,9 @@ template("android_library") {
     if (defined(invoker.dex_path)) {
       dex_path = invoker.dex_path
     }
+    if (defined(invoker.manifest_entries)) {
+      manifest_entries = invoker.manifest_entries
+    }
 
     supports_android = true
     requires_android = true