Merge "Add support invoke-custom to dexdump" am: fb30f5f30f
am: d10807c620

Change-Id: I2823c4bd32c0cab9c6451e058e340f376f8899c2