Merge "Make SafeDexInstructionIterator more robust"