Move some sruff from main init.rc

Change-Id: I44f59af56be6fa7279bbbcef6f9ed96c1463271c