am 2e0d1af7: Merge changes I58d43128,Ie34c958f

* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
  Remove HAVE_SELINUX guards, part 2
  Remove HAVE_SELINUX guard