Merge "Dexdump: fix type printing for call sites" am: 11a482dfa5
am: 6888fa8e54

Change-Id: Ice5772cfe0cd0074b09d8dbd5ea7b065ddf4219b