Merge "Fix dex file verification check for dexlayout output file."