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

Change-Id: Ib0c018e0250c11c6577b5b0c92aa6c5a006cc557