cppcheck performance fixes in android/
Merge pull request #5995 from tobbi/cppcheck_perf_android

cppcheck performance fixes in android/