Handle both AOSP and CM style fstabs

Signed-off-by: David Greaves <david@dgreaves.com>