Merge "Do not allow input-vdex with dexlayout."
am: 74f94dd8ed

Change-Id: I46e06c425ee706cb684bf089505da13161e544db