-Werror=shadow

Change-Id: I85a16b1a445d336ae450cfb3e4884d0bc637b0b9