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

Change-Id: I24b72ee3057d3674dee262b9b4baf8b4d2ce16cb