am 587fc682: Merge "Add missing includes for pid_t."

* commit '587fc682ec1e81c400cd61f742bf8a0a26343425':
  Add missing includes for pid_t.