Merge "Switch to slicer DEX opcode definitions" am: c2348fa906
am: 03f0ab51ea

Change-Id: I11c2ee0e45f62e0e05f107ff5350011c56eb183e