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

Change-Id: If3523d7fd0ff91ee727bb3f021ce2c5c3739e0b6