Merge "Use -Werror in external/jsoncpp"