Fixup 2/X
* Add more oppo changes
* Revert some changes to caf
* Cleanup dts