Merge "Fix clang-tidy performance warnings in system/extra."
am: a0ec73d961

Change-Id: I5ed2ff253a76ae497c42c5b2d343d638bfbbf08b