Merge "Refactor DexInstructionIterator"