Merge "Update fs_mgr_update_verity_state() for new C++ Fstab" am: ac1812ddb5
am: 088da2d4fe

Change-Id: Iba4e6ef38b0af1a4214fccfdb2dc9c2d0551ba32