Android 7.1.0 release 3
Merge "bundle init.rc contents with its service"