am 8d450c66: Merge "Add missing <string.h> include."

* commit '8d450c66545b819aff582c033b6a7de0ff04c905':
  Add missing <string.h> include.