Merge "Fix "error: 'memset' was not declared in this scope"."