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

Change-Id: Ic220dfe71d5a12b982d0e60eef14e5d0d192e2f4