Remove SELinux additions from public API

Change-Id: If2e076312b0e411145c1cd900f3ae20d998a0f24

Conflicts:
	api/current.txt
Simplify check during admin removal for whether to cleanup SELinux

Also re-arrange and cleanup

Change-Id: I1261e715d8d04b72f8a29b8a24268d75946d24dc