Merge "Fix clang-tidy performance warnings in system/core." am: 69ff5009c7
am: 18f9c66823

Change-Id: Ica41ab22d44bd8d166b4a694c02b9b639a852777