am e24264a6: am f310f6c5: Merge "Remove HAVE_SELINUX guards"

* commit 'e24264a618c6325445cc64c5f7c4000df6d358fa':
  Remove HAVE_SELINUX guards