Merge "Fix clang-tidy warnings in libs/hwui."