cppcheck: fix some redundantAssignment

Change-Id: I9ea73bada743b195d778b17038137e9089d03404