Revert of Reland of: Refactor process_resources.py to use aapt's --extra-packages

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index ffa18f20db9066112e1ecdbebe3dadc9d54c6079..f1c5bbfe4951280d875cb0b6e7f7be914c3acf8c 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -286,6 +286,14 @@
         'resource_input_paths': [ '<!@(find <(resource_dir) -name "*")' ]
       },
     }],
+    ['R_package != ""', {
+      'variables': {
+        # We generate R.java in package R_package (in addition to the package
+        # listed in the AndroidManifest.xml, which is unavoidable).
+        'additional_res_packages': ['<(R_package)'],
+        'additional_R_text_files': ['<(intermediate_dir)/R.txt'],
+      },
+    }],
     ['native_lib_target != "" and android_must_copy_system_libraries == 1', {
       'dependencies': [
         '<(DEPTH)/build/android/setup.gyp:copy_system_libraries',