Merge "fs_mgr: remove same partition check for vbmeta"

            continue;

        }

        // Ensures that hashtree descriptor is in /vbmeta or /boot or in

        // the same partition for verity setup.

        std::string vbmeta_partition_name(verify_data.vbmeta_images[i].partition_name);

        if (vbmeta_partition_name != "vbmeta" &&

            vbmeta_partition_name != "boot" &&  // for legacy device to append top-level vbmeta

            vbmeta_partition_name != partition_name) {

            LWARNING << "Skip vbmeta image at " << verify_data.vbmeta_images[i].partition_name

                     << " for partition: " << partition_name.c_str();

            continue;

        }

        for (size_t j = 0; j < num_descriptors && !found; j++) {

            AvbDescriptor desc;

            if (!avb_descriptor_validate_and_byteswap(descriptors[j], &desc)) {