Merge "Fix a couple of issues with system_server forking."