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

Change-Id: Iabdd8a8009cb6b0210d850299cc07dfc29961868