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