Pick up some fixes from upstream for -Wshadow errors.

Pick up some fixes from upstream for -Wshadow errors. Previously,
these errors were not detected in our build, as the VCSID mechanics from
cros-workon.eclass caused configure to believe that our version of gcc
did not support -Wshadow. Once this was fixed, the error was exposed.

BUG=none
TEST=Build with https://gerrit.chromium.org/gerrit/#change,13807
patched in.

Change-Id: I3681e8fa05f04dcd86e7983dff45a63e7075a4aa
Reviewed-on: https://gerrit.chromium.org/gerrit/14177
Commit-Ready: Nathan J. Williams <njw@chromium.org>
Tested-by: Nathan J. Williams <njw@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
1 file changed