Merge "Clang: Fix some more tautological-compare warnings."