Android: sync up latest JNI generator changes from downstream.

build/jni_generator.gypi

Index: build/jni_generator.gypi
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index a6c8364d44caae14e8b3e9739ba8a46c48c53247..ddaad0114b85d149b9e5370df84c27d3ae4158b0 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -32,6 +32,10 @@
     'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py',
     'jni_generator_jarjar_file%': '',
     'jni_generator_ptr_type%': 'int',
+    # A comma separated string of include files.
+    'jni_generator_includes%': (
+        'base/android/jni_generator/jni_generator_helper.h'
+    ),
   },
   'rules': [
     {
@@ -49,6 +53,8 @@
         '<(RULE_INPUT_PATH)',
         '--output_dir',
         '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni',
+        '--includes',
+        '<(jni_generator_includes)',
         '--optimize_generation',
         '<(optimize_jni_generation)',
         '--jarjar',