Merge "Add nofail fstab option" am: e992831
am: c375b37  -s ours

* commit 'c375b37c3a130c78dc9b7a467398d561faf10c50':
  Add nofail fstab option

Change-Id: I22fbaf70d411a71abddda93bf83b078a45615eaf