Revert "Merge remote-tracking branch 'origin/Oppo' into kk4.4"

This reverts commit 67033644df1a92c2dcfbabba1b37d12f3bff1385, reversing
changes made to 71d8216ef197071584506a07b595b172d8a7528e.