am e9e55de9: Merge "Revert "Move host functionality to common selinux dir""

* commit 'e9e55de98a586505bc55299421aa66904573039c':
  Revert "Move host functionality to common selinux dir"