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

Change-Id: I7a3d89debf7b94012e999747caaddc1ae3afeba7