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

Change-Id: Ib4f4f33ac899f6037f501c8beb6302c6a8567bab