am e998bb17: (-s ours) am 94f3e47d: Merge "Fix the instruction set for dex...
am e998bb17: (-s ours) am 94f3e47d: Merge "Fix the instruction set for dex file during (re)moving ops."
* commit 'e998bb17':
Fix the instruction set for dex file during (re)moving ops.