-Werror,-Wshadow

Change-Id: I503ee7c2d53507e878fbbccf562f44908c203c49