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