-Werror,-Wshadow

Change-Id: Ia03dc71a3d4e4380258e7f8d2ebc3c9f32d83493
(cherry picked from commit f05c37d3fdc8ef6839c6ebe43ae1a375f3073def)
loplugin:unusedvariablecheck

Change-Id: I48c2421598152b64d40237eb0e917a680a27b643
(cherry picked from commit 71bed3b736957d09a5379725ce5c97f5166ea30d)