Android 7.0.0 Release 32 (NBD92F)
Merge "bundle init.rc contents with its service"