Android 7.1.1 release 25
Merge "bundle init.rc contents with its service"