Merge "Re-enable warnings as errors."