Rename update_device.py's --disable-vabc param

update_device.py has a --disable-vabc option, and what it really does is
set virtual ab compression param to none, but still uses snapuserd.
There is also a --disable-vabc option in ota_from_target_files, which
completely disables virtual ab compression and fall back to plain vab.
To keep naming consistent, rename update_device.py's option to
--vabc-none.

Test: th
Change-Id: Ifba27f19ed8132bf1a3023481740461faa50207c
diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index 0ec6a38..26c3d59 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -489,8 +489,8 @@
     // update estimate_cow_size if VABC is disabled
     // new_cow_size per partition = partition_size - (#blocks in Copy
     // operations part of the partition)
-    if (install_plan_->disable_vabc) {
-      LOG(INFO) << "Disabling VABC";
+    if (install_plan_->vabc_none) {
+      LOG(INFO) << "Setting Virtual AB Compression algorithm to none";
       manifest_.mutable_dynamic_partition_metadata()
           ->set_vabc_compression_param("none");
       for (auto& partition : *manifest_.mutable_partitions()) {
diff --git a/payload_consumer/install_plan.cc b/payload_consumer/install_plan.cc
index 91eb53b..cea8e5a 100644
--- a/payload_consumer/install_plan.cc
+++ b/payload_consumer/install_plan.cc
@@ -26,7 +26,6 @@
 #include <base/strings/stringprintf.h>
 
 #include "update_engine/common/utils.h"
-#include "update_engine/payload_consumer/payload_constants.h"
 #include "update_engine/update_metadata.pb.h"
 
 using std::string;
diff --git a/payload_consumer/install_plan.h b/payload_consumer/install_plan.h
index 926af98..8fe104a 100644
--- a/payload_consumer/install_plan.h
+++ b/payload_consumer/install_plan.h
@@ -73,7 +73,7 @@
       ErrorCode* error);
 
   bool is_resume{false};
-  bool disable_vabc{false};
+  bool vabc_none{false};
   std::string download_url;  // url to download from
   std::string version;       // version we are installing.