Use selinux not a HACK!

Change-Id: Ia30b8d2d11855e61005960351cfb9feb3ad8f9fb