-Werror,-Wshadow

Change-Id: Ia03dc71a3d4e4380258e7f8d2ebc3c9f32d83493