misc: merge my local changes

* fixup custombootimg.mk for huashan
* unbreak the sepolicies conflicting with each other
* readd the patch for media-caf
* rewrite the patch for display-caf
* unbreak the unadded overlays