am c5067890: Merge "Add missing <string.h> and <unistd.h> includes."

* commit 'c50678901ebef8c13c9e914eb6c6a64ed91be4b5':
  Add missing <string.h> and <unistd.h> includes.