Merge "Added extra safety in dexdump2 -d option around nonsense code." am: 7b2a8bf789
am: e96870ec63

Change-Id: I6f0db5ac97f25b231e597758bc096c37d2868cc0