Revert "resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp"

This reverts commit 20f5daa8653eb2d81af8c161a2084e3b53ec3914, reversing
changes made to d94301799518a69f2b2b5a2b20bf9d4403658d7e.

Conflicts:
	toolbox/Android.mk
	toolbox/ls.c
Revert "am 7b88a90d: Merge "Remove HAVE_SELINUX guards""

This reverts commit 2a36ae5608e9d655b2bb14ce538f6fbdb910cada, reversing
changes made to 20f5daa8653eb2d81af8c161a2084e3b53ec3914.

Conflicts:
	init/builtins.c
	init/devices.c
fix leftover conflict
fix HAVE_SELINUX guards for current HEAD