cppcheck: Missing bounds check for extra iterator increment in loop

Change-Id: Ia6f7d35acacc99b4cfe4f8b8d5a7c81e97558205
cppcheck: Prefer prefix ++/-- operators for non-primitive types

Change-Id: Ieb7933207ed921353a9681ce850d0f4a38d69759