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

Change-Id: I0d94691d4badc1814fd1993484e5ddefb223442c