Merge "Refactor DexInstructionIterator"
am: 5f317039d8

Change-Id: Ic5700394962de8d16508aa6f8e2e8e49bfe337ea