Merge "Fix disable-verity when the underlying block device is RO"