Merge "Re-enable -Werror on clang"