am f310f6c5: Merge "Remove HAVE_SELINUX guards"

* commit 'f310f6c5725f9f9985ee30e744a2b65fed9d572e':
  Remove HAVE_SELINUX guards