Merge "Revert "Temporarily always enable dexlayout output verification.""
am: 1c46063ba8

Change-Id: I8db1867a493519d94097408d641e2ce5e6340fb5