Merge "Use selinux_android_setcon() instead of setcon()" am: 64cc0825a6
am: 4692984e92

* commit '4692984e92de83299f4c03ec176c9a4b4dcb0292':
  Use selinux_android_setcon() instead of setcon()