Merge "logd: fix various clang-tidy issues"