-Werror=shadow

Change-Id: I6160150950d981a01b49cfc4c740683c1fd89b8e