Merge "Extend dexdump2 tests for invoke-custom" am: e15c48f3fc
am: d8d81f31f5

Change-Id: I960e8b64d66f8a0e2f484d186dd40a1af87709fc