am 6490257d: Make netd restart when system server hangs on it.

Merge commit '6490257d116c35d3da927ee7b91179dde64ef713' into gingerbread-plus-aosp

* commit '6490257d116c35d3da927ee7b91179dde64ef713':
  Make netd restart when system server hangs on it.