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

Change-Id: I6601f3ba54d0952d81ddc2b5106010847b8ebf70