Merge "Fix dex file verification check for dexlayout output file." am: 8f48f4cb17 am: 42b39b2bb9
am: 5aedb2b0f8

Change-Id: I431bcd1f10198e577033a5df728719d3d6f9ef5e