Merge "fs_mgr: removing the dependency of requiring /vbmeta in fstab for AVB"