Merge "Respect that status property when parsing fstab from device tree" am: ea043a1d43 am: faad4c62f8 am: 485f5b606d  -s ours
am: 0788831778  -s ours

Change-Id: I90340e82353daab7636ec363292b7747f8dd858d