sysinit and userinit: reduce breakage of checkpolicy?

Change-Id: I6a39332c05121ef010238d9ad2e4b2f1dbc1e064