Snap for 4719555 from 432e844d2b to qt-release

Change-Id: I2e8876630bad7acc4c9835b5310e2d4ec405dfba

Android.mk

@@ -156,7 +156,7 @@ LOCAL_STATIC_LIBRARIES := \
     libhealthstoragedefault \
     libhidltransport \
     libhidlbase \
-    libhwbinder_nolto \
+    libhwbinder_noltopgo \
     libvndksupport \
     libbatterymonitor
 

roots.cpp

@@ -333,6 +333,7 @@ int format_volume(const char* volume, const char* directory) {
     "-f",
     "-O", "encrypt",
     "-O", "quota",
+    "-O", "verity",
     "-w", std::to_string(kSectorSize),
     v->blk_device,
   };

updater/install.cpp

@@ -544,12 +544,10 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
     const char* f2fs_argv[] = { "mkfs.f2fs",
                                 "-d1",
                                 "-f",
-                                "-O",
-                                "encrypt",
-                                "-O",
-                                "quota",
-                                "-w",
-                                "512",
+                                "-O", "encrypt",
+                                "-O", "quota",
+                                "-O", "verity",
+                                "-w", "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };