[Merge M48] Fix jar_toc.py to include public/protected methods

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 774475bf73938b0db2982d31bf4f0a57f5b1f278..b8309561fbc1290e46d7a5492b192af966eb9dfc 100755
--- a/build/android/gyp/jar_toc.py
+++ b/build/android/gyp/jar_toc.py
@@ -53,11 +53,13 @@ def CallJavap(classpath, classes):
 def ExtractToc(disassembled_classes):
   # javap output is structured by indent (2-space) levels.
   good_patterns = [
-      '^[^ ]', # This includes all class/function/member signatures.
+      '^[^ ]', # This includes all class signatures.
       '^  SourceFile:',
       '^  minor version:',
       '^  major version:',
       '^  Constant value:',
+      '^  public ',
+      '^  protected ',
       ]
   bad_patterns = [
       '^const #', # Matches the constant pool (i.e. literals used in the class).