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

Change-Id: I7cbd828531927d517b319ca3795eae2c3c049cc7