Merge "Fix clang-tidy warnings in iotop."