Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel" am: d90872832e

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

Change-Id: Ibffbf44da1204099a2513441158aff6833f53638