Merge "Fix clang-tidy performance-* warnings in system/extras." am: a386d2168e am: 84d340ae12
am: 4f634fa74c

Change-Id: I2b7fddc7b4177b97ea6108fc296bc2fee9a5b317