Merge \"Added a dexdump test containing every DEX instruction\"
am: 5f5560dbce

Change-Id: I1360035879b2f4afaf2e761e0ca55fb85169c957