Checkfs fixes, support dualboot fstab

Change-Id: I8631b1819b87f938fed3ce4bf533e8e784d0c5b3
Moar checkfs messing around

Change-Id: Ia5e83608b310aae4d74dbbc264551d315ca4e9dc