am 60c5a460: Merge "Remove calls to is_selinux_enabled()"

* commit '60c5a460c1906e52717afde1dc38630b30fc564e':
  Remove calls to is_selinux_enabled()