am 50d42703: Merge "Remove HAVE_SELINUX guards"

* commit '50d42703936b87ffdd5b9ec135d7e0e4af8aa31f':
  Remove HAVE_SELINUX guards