Merge "Revert "Temporarily always enable dexlayout output verification."" am: 1c46063b am: c60d2dd0 am: 15f12243 Change-Id: I4517ae08d0233ecee01e34f90d3c55069d907186