Android 7.0.0 Release 7 (NRD91D)
Merge "bundle init.rc contents with its service"