Android 7.0.0 release 15
Merge "bundle init.rc contents with its service"