Merge \\"Fix clang-tidy performance warnings in perfprofd.\\" am: c2643f1c69
am: adcc021b8c

Change-Id: I36a6b4ebb9c904443765b0eb875d9ab4885ba2b5