Android 7.1.1 Release 38 (N6F26Y)
Merge "bundle init.rc contents with its service"