fix -Wunreachable-code-loop-increment

This is part of a cleanup to fix instances of the
-Wunreachable-code-loop-increment warning, which we plan to enable under
-Werror by default.

This isn't intended to be a functional change.

Bug: 150166387
Test: TreeHugger
Change-Id: Iecaee50ba3748ff48aa5eac9e13c558cf37d52b3
2 files changed