am 0a7936b7: Merge "Fix a couple of issues with system_server forking."

* commit '0a7936b7c54fb7dff0406a40452cb0242f66a067':
  Fix a couple of issues with system_server forking.