Variable shadowing and a few other non-bug warnings.

BUG=None

Change-Id: Ibf62d6e7fef91fc213a53a6902f494147ed30ebc
Reviewed-on: https://chromium-review.googlesource.com/283223Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>