Reconcile init.rc gently with CM

Change-Id: Ifef10da69924a590d36c25ae1b9ef8ceab715fd1