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

Change-Id: I2ddde3bf4af200d8388d5f88d8a76dc07646c66c