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

* commit '907bcd96d7f54adaf3b3df6f476e09c636c646cf':
  Fix a couple of issues with system_server forking.