Merge "Remove unused variables" am: edab2ac359 am: 1f481b6f2f

Original change: https://android-review.googlesource.com/c/platform/development/+/2495416

Change-Id: Icc8ecf904d0eb5f079bce9ccf6a8033933ee9429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/etc1tool/etc1tool.cpp

@@ -489,7 +489,6 @@ int main(int argc, char** argv) {
     bool bEncodeDecodeSeen = false;
     bool bEncode = false;
     bool bEncodeHeader = false;
-    bool bDecode = false;
     bool bShowDifference = false;
 
     for (int i = 1; i < argc; i++) {
@@ -517,7 +516,6 @@ int main(int argc, char** argv) {
                     bEncodeHeader = false;
                 } else if (strcmp(pArg, "--decode") == 0) {
                     multipleEncodeDecodeCheck(&bEncodeDecodeSeen);
-                    bDecode = true;
                 } else if (strcmp(pArg, "--showDifference") == 0) {
                     if (bShowDifference) {
                         usage("Only one --showDifference option allowed.\n");