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

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

Change-Id: Ia1b446180986e54bb599abf67c24b291328b3e02