am 6c0730fc: Merge "Fix "error: \'memset\' was not declared in this scope"."

* commit '6c0730fc1030bb41f8857ba5ff768dedb961dce0':
  Fix "error: 'memset' was not declared in this scope".