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

Change-Id: I07435ef01b79ba4b5f5cee65ec7a9d85c3cae2c4