Split fstab mount into 2 phases
am: 8e5c9b8028

Change-Id: I2227bfbc5c0c65ad71246ffbf1dacbadb137aa8b