Merge "Fix clang-tidy warnings in librscpptest."