Merge "Fix "error: use of undeclared identifier 'memset'"."