Merge "fstab.hikey960: make it possible for vendor partition to be remounted" am: dc8ba44cb3 am: 9519851722

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1326954

Change-Id: I18452a3b2dde590f8349698343f5a153a34695c8