Remaining -Werror=unused-variable fixes to get sc build again

Change-Id: I43a15ad87422201989f3facb0b992ec73d3315ae