Merge changes Ica6bf5c6,I3f626433

* changes:
  fs_mgr: libdm: add support android-verity target.
  dmctl: Do not skip argument if not matched with '-ro'.