Merge "fs_mgr_fstab: Add Adiantum support"
am: bb81135fda

Change-Id: Ic5f90dbd5301e46a2f96d706f21f51e7ba5951dc