Android 7.1.2 Release 17 (NJH47B)
Merge "bundle init.rc contents with its service"