Android 7.1.1 Release 16 (NUF26K)
Merge "bundle init.rc contents with its service"