Merge "Use -Werror in build/make"