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

Change-Id: I405e0c351778e84908630e282e58c9ff92fa800c