Keep package access members in TOC files

build/android/gyp/jar_toc.py

Index: build/android/gyp/jar_toc.py
diff --git a/build/android/gyp/jar_toc.py b/build/android/gyp/jar_toc.py
index c05a42ac207f9814f5437748d5fccccc31ae7ea0..9baa8e574952deebd20eb642c9b087ea60b39ca2 100755
--- a/build/android/gyp/jar_toc.py
+++ b/build/android/gyp/jar_toc.py
@@ -7,8 +7,10 @@
 """Creates a TOC file from a Java jar.
 
 The TOC file contains the non-package API of the jar. This includes all
-public/protected classes/functions/members and the values of static final
-variables. Some other information (major/minor javac version) is also included.
+public/protected/package classes/functions/members and the values of static
+final variables (members with package access are kept because in some cases we
+have multiple libraries with the same package, particularly test+non-test). Some
+other information (major/minor javac version) is also included.
 
 This TOC file then can be used to determine if a dependent library should be
 rebuilt when this jar changes. I.e. any change to the jar that would require a
@@ -38,7 +40,7 @@ def GetClassesInZipFile(zip_file):
 def CallJavap(classpath, classes):
   javap_cmd = [
       'javap',
-      '-protected',  # In reality both public & protected.
+      '-package',  # Show public/protected/package.
       # -verbose is required to get constant values (which can be inlined in
       # dependents).
       '-verbose',