Merge "Do not allow input-vdex with dexlayout."