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

Change-Id: Id0ae5013ede91a967a26d44cffde0a79e2c2185b