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

Change-Id: I0c63d2b7c1316b00c60d02faf2c08f77283ae4aa