am 8246d45e: Merge "bundle init.rc contents with its service"

* commit '8246d45e94bfb0ce878f41a01602b7b8d78c40ad':
  bundle init.rc contents with its service
tree: 8cade762d952bcb3cabd217449d30ede5787218f
  1. client/
  2. include/
  3. server/
  4. Android.mk