Merge "fs_mgr_fstab: Add Adiantum support" am: bb81135fda am: 27740d4d3e
am: af2f0afbbd

Change-Id: I8145ee86a0919afe62c03aff8d59e82dda7c4faa