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

Change-Id: Ifff898d3c20611801f6dacaef34c8ff79efb7793