am 56aa0715: am fb902335: Merge "Add missing <string.h> includes."

* commit '56aa0715e380a05eecf461a4220bd67e32030b36':
  Add missing <string.h> includes.