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