Reconcile a few insufficiently motivated diffs in init.rc

Change-Id: I816b9e89cf928c58643afc6fcab05c2a4dfe3708