Merge "Stop using -Wno-unused-variable" am: 8a73bf6710 am: e3a45f74b9

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021315

Change-Id: I27c8d91e93f38c87a077f8ccaeb4ce6826457c2b