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

Change-Id: I7a397030eb8a889c8d9f461d44c566def0479a01