am 340e9691: Merge "Include <string.h> for memset."

* commit '340e969103133ddf924d8b2d7e026ee6db0a5457':
  Include <string.h> for memset.