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

Change-Id: I0c84ff5be422037734b97c3b18edf18f922c9885