Merge "Revert "Move host functionality to common selinux dir""