Merge "Fix clang-tidy performance warnings in system/security."