Revert "init: More from samsung lollipop"

This reverts commit 7f05552399ba2c3fddf2e04e5ca0f836fd7f5d4c.
Revert "init.rc: follow samsung lollipop"

This reverts commit d9f1d4e23544496c7fa12d426302822d211e75ef.