Merge "clang: disable -Wunreachable-code-loop-increment"