Merge "Remove Wno-unused-variable from defaults and fix resulting warnings."
am: 31efcf36f7

Change-Id: Ief479dd85c2788a58ca7f9f4215c0494df1cf441