Inherit S4 patch for Flo
Revert "Support for Koush superuser/init.d"

This reverts commit 0a83073f02ed88511a70fb24081fe7057136c865.

Conflicts:
	products/common.mk
Switch back to user instead of userdebug