WaE: -Werror=shadow and -Werror=unused-but-set-variable

Change-Id: Ic42d506db8fe065cb8f01e17f18a1238d1eff651