Merge "Fix warnings and turn on -Werror for C++ tests."