Merge "Added new -v option to dexlayout to verify output dex file." am: 224f6ab762
am: 1e123497ac

Change-Id: I8879e7d5c4a684877fff48cf3da2a2060e95e369