Merge \\"init now uses libprocessgroup, so set up /acct.\\" am: 279876c932
am: c58d7dda8c

Change-Id: I8398a7b4b95979d6502545dcfd931a5ce0d28069