[NOT FOR COMMIT] Added GN support for Android .AAR packaged libraries

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 0b9fa9d12400a017bf48db6fb98a71dcf85ddcb0..55346673403291337642b9fffdbb87f254f5c665 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -25,7 +25,7 @@ template("write_build_config") {
     assert(type == "android_apk" || type == "java_library" ||
            type == "android_resources" || type == "deps_dex" ||
            type == "android_assets" || type == "resource_rewriter" ||
-           type == "java_binary" || type == "group")
+           type == "java_binary" || type == "group" || type == "android_aar")
 
     forward_variables_from(invoker,
                            [
@@ -71,15 +71,16 @@ template("write_build_config") {
     is_android_resources = type == "android_resources"
     is_deps_dex = type == "deps_dex"
     is_group = type == "group"
+    is_aar = type == "android_aar"
 
     supports_android = is_apk || is_android_assets || is_android_resources ||
-                       is_deps_dex || is_group ||
+                       is_deps_dex || is_group || is_aar ||
                        (is_java && defined(invoker.supports_android) &&
                         invoker.supports_android)
-    requires_android =
-        is_apk || is_android_assets || is_android_resources || is_deps_dex ||
-        (is_java && defined(invoker.requires_android) &&
-         invoker.requires_android)
+    requires_android = is_apk || is_android_assets || is_android_resources ||
+                       is_deps_dex || is_aar ||
+                       (is_java && defined(invoker.requires_android) &&
+                        invoker.requires_android)
 
     assert(!requires_android || supports_android,
            "requires_android requires" + " supports_android")
@@ -90,8 +91,9 @@ template("write_build_config") {
     assert(is_android_resources || true)
     assert(is_deps_dex || true)
     assert(is_group || true)
+    assert(is_aar || true)
 
-    if (is_java || is_apk) {
+    if (is_java || is_apk || is_aar) {
       args += [
         "--jar-path",
         rebase_path(invoker.jar_path, root_build_dir),
@@ -149,7 +151,7 @@ template("write_build_config") {
       }
     }
 
-    if (is_android_resources || is_apk) {
+    if (is_android_resources || is_apk || is_aar) {
       assert(defined(invoker.resources_zip))
       args += [
         "--resources-zip",