Merge "Add some extra dexanalyze tests"
am: fc2f8b6d93

Change-Id: If10d94033ab39e97cd363a368273ebb14f70b744