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

Change-Id: I9ec1c8a110cc1ba443da47db37f8ca79dae19cab