Merge "clang: disable -Wunreachable-code-loop-increment" am: 9ef7df4ae2 am: cf64c66ce7

Change-Id: I658d2de6c4477e0917cec9a9617ffcf3b97988e9