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

* commit '644ebc8800ad5e2fa1c239bd65a2cf6a88e6556b':
  Fix a couple of issues with system_server forking.