Add additional patch to fix gcc-4.8 warnings. Do not disable -Werror.