am 8dd5f33b: am 9b1f7c8f: Merge "Add missing <string.h> include."

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