Merge "Move to new Fstab class"
am: 12e20e3f2a

Change-Id: I09be93fbbade4a7ef01c4bf0ea4c202da3ec2f7b