kernel: Merge oppo changes