Cppcheck: fix Prefer prefix ++/-- operators for non-primitive type

Change-Id: I9345e04ca9538028a340fba5bfcf2e58a9825bf9
Merge topic 'cppcheck_branch' into master

442274c7 Cppcheck: fix Prefer prefix ++/-- operators for non-primitive type