Android n mr1 preview 1
Merge "bundle init.rc contents with its service"