Merge "Move to new Fstab class"
am: fa3bf1fe55

Change-Id: I7c3f234af69c1cfea14e33c545d68bed9a0f03e3