am 4ff85ad2: am 50d42703: Merge "Remove HAVE_SELINUX guards"

* commit '4ff85ad26acab3f4bbab6195c5e092999164f7d8':
  Remove HAVE_SELINUX guards