Add support for Android aidl and support for gyp's java_in_dir

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 376b4fa040b0272b517fcdf49993238bec3a6266..224630f3eac379cceed92621dc85787b81ed9d56 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -508,11 +508,23 @@ template("java_library") {
 # Runs Android lint against the compiled java files.
 # Dexes the output jar for inclusion in an APK.
 template("android_java_library") {
-  assert(defined(invoker.java_files))
+  assert(defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))
   assert(defined(invoker.build_config))
   assert(defined(invoker.jar_path))
   assert(defined(invoker.dex_path))
 
+  _java_files = []
+  if (defined(invoker.java_files)) {
+    _java_files = invoker.java_files
+  } else {
+    _java_files_build_rel = exec_script(
+        "//build/android/gyp/find.py",
+        ["--pattern", "*.java", rebase_path(invoker.DEPRECATED_java_in_dir, root_build_dir)],
+        "list lines"
+        )
+    _java_files = rebase_path(_java_files_build_rel, ".", root_build_dir)
+  }
+
   _jar_path = invoker.jar_path
   _dex_path = invoker.dex_path
 
@@ -530,7 +542,7 @@ template("android_java_library") {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     build_config = invoker.build_config
-    java_files = invoker.java_files
+    java_files = _java_files
 
     if (defined(invoker.srcjar_deps)) {
       srcjar_deps = invoker.srcjar_deps
@@ -546,7 +558,7 @@ template("android_java_library") {
     android_lint("${target_name}__lint") {
       android_manifest = _android_manifest
       jar_path = _jar_path
-      java_files = invoker.java_files
+      java_files = _java_files
     }
   }