adapt fstab configs to unified fstab

Change-Id: I65701b37cbb7ae76e05ae580e1dc97fbdfd35d5c