Revert "selinux: merge caf commit"

This reverts commit 66071d09d7c6a81f7204a1bd8d44e56316544881.