Merge \\"Fix clang-tidy performance warnings in simpleperf.\\" am: 43b194dc15
am: 431d1f1748

Change-Id: Ic318ec8b77819751e3c72b953c1eca6cbbcf47e0