Merge "Extend dexdump2 tests for invoke-custom"