Merge "Fix the instruction set for dex file during (re)moving ops."