Merge "Revert "Temporarily always enable dexlayout output verification.""