am 833c0b83: (-s ours) am aae1bbf4: Merge "bundle init.rc contents with its service"

* commit '833c0b83da42ac813067be3f1f3d0c84d0502e34':