Revert^2 "Refinements relating to invoke-custom"

This reverts commit bd6107f1deec28e1184bfa4fd5a717d6b35b259d.

Use the dump informatin from dx to validate call sites rather using
dexdump. The latter is not available in the buildbot build.

Bug: 36641082
Test: dalvik/dx/tests/run-all-tests
Test: dalvik/dx/tests/run-test 135
Change-Id: Id7126010bc84f9bade956c9a4c8c1c5563a307fe
10 files changed