Revert: "Add OPPO changes 21/07 to kernel/*"

This reverts commit 206b4e258ec33b193b82bc30687331c7dfc96e23 almost