am 2a36ae56: am 7b88a90d: Merge "Remove HAVE_SELINUX guards"

* commit '2a36ae5608e9d655b2bb14ce538f6fbdb910cada':
  Remove HAVE_SELINUX guards