Merge branch 'master' of https://github.com/oppo-source/kernel-source
Merge branch 'master' of https://github.com/oppo-source/kernel-source