Merge "Add some extra dexanalyze tests" am: fc2f8b6d93
am: 9fc86ebc14

Change-Id: Icf92080d1eecc285f388befb0a6b597f5ff05abf