Merge "Fix DexInstructionIterator overrun bug"