Android CTS 7.1 Release 21 (4976769)
Merge "bundle init.rc contents with its service"