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

* commit 'bd62797606b0fd083f5a83c3e8089407c6a83c85':