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