Merge branch 'android-4.14-phoenix' of https://github.com/PhoenixKernel/linux into lineage-21

Change-Id: I2ed4fbc934d7ae843dc203ba401d062bb90a37ac