Merge "Fix dex file verification check for dexlayout output file."
am: 8f48f4cb17

Change-Id: I2e6a011f5bf1b2bbb1d190f8f9936b4c8ef2fe56