Merge \\"Fix clang-tidy performance warnings in system/vold.\\" am: e24d4eef9b
am: aa668f3d13

Change-Id: I7f175785ab17ad9107bd11e9cd4ff0a9a7cbd460