Merge "Temporarily disable -Werror in Chromium."