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

Change-Id: I8f4f1a2f0301fa88650974b70ef87e9aa885330e