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

Change-Id: I39beddeea028b38b6a247019a33e6d3d58b810e4