-Werror=shadow

Change-Id: I940661c947307dc5dea371e5e6f9a9aedbfc904d