Merge "Make SafeDexInstructionIterator more robust"
am: f199f1d3a9

Change-Id: Iaae95f8b9063303d40ad338aa8943591aee60318