Merge "Add nofail fstab option"
am: e992831

* commit 'e99283103bbd06a2b8a40971ed161d9d0518f79e':
  Add nofail fstab option

Change-Id: Iada8393491847037b33e7de4ac5ccf3b7e9eba6f