Fix patch conflict
Add wip to disable SELinux
Rebase and remove unnecessary patch.
Merge branch 'tbm' into b2g-5.0.0_r5