Merge "Add getpgid to system_service and init" am: 2122f1fe95 am: 043068593a
am: 24d0cad327

Change-Id: Ieffac9d2e5ff8500534cf9935eff9918989c2fb4