-Werror=shadow

Change-Id: I663824865d6f3dfec83e0b71992d1ab3c9f184f2