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

Change-Id: If493ebfa391324f637d2066cd99e1fcbfe44e40c