Merge "Fix clang-tidy performance warnings in system/core." am: 146fd24c4b
am: 8ec85ebdf0

Change-Id: I2593f77fe8347283378b80f237480a71311add6a