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

Change-Id: Ie7206846246bd50fbc758e972b83596bcacb3faf