Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" am: abc26ed753 am: 7da0c3db16
am: 70bcce4deb

Change-Id: I7a44cc2f7a3e12d931ee116c25e0f4ce73c32e72