Reland allow JUnit3/4 tests within the same apk to be run by test_runner

build/android/pylib/utils/dexdump.py

Index: build/android/pylib/utils/dexdump.py
diff --git a/build/android/pylib/utils/dexdump.py b/build/android/pylib/utils/dexdump.py
index 972a22d49df770005c7cda8858b0d605b2b16087..2bb11ce198ec5447993060371eed4d03f673dcbf 100644
--- a/build/android/pylib/utils/dexdump.py
+++ b/build/android/pylib/utils/dexdump.py
@@ -67,7 +67,12 @@ def _ParseRootNode(root):
   results = {}
   for child in root:
     if child.tag == 'package':
-      results[child.attrib['name']] = _ParsePackageNode(child)
+      package_name = child.attrib['name']
+      parsed_node = _ParsePackageNode(child)
+      if package_name in results:
+        results[package_name]['classes'].update(parsed_node['classes'])
+      else:
+        results[package_name] = parsed_node
   return results
 
 
@@ -107,4 +112,4 @@ def _ParseClassNode(class_node):
   for child in class_node:
     if child.tag == 'method':
       methods.append(child.attrib['name'])
-  return {'methods': methods}
+  return {'methods': methods, 'superclass': class_node.attrib['extends']}