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

* commit '449831f8b3dce8a6773ebd80b6eacce4c65d36a6':
  Include <string.h> for memset.