-Werror=unused-but-set-variable

Change-Id: Ia65754272ff5c1661241dd503cef23c7a89b660e
(cherry picked from commit 580e21154196a4b1f3e48d3d4d2395d1c182c580)