Fix variableScope warnings

cppcheck flags that these variables can be declared at lower scopes.
Not sure if that's desired here, but up to the maintainer.

Change-Id: I06a4bed89401450a03c92489b0c9ce54511b6621
Signed-off-by: Ed Tanous <edtanous@google.com>
1 file changed