Merge "hikey: Fix fstab.hikey-3.18 to not mount cache partition"