Merge "Respect that status property when parsing fstab from device tree"
am: ea043a1d43

Change-Id: Id23c5509001726781778721e7adb5b20a71fd407