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

* commit 'ee84451582a1ccf3a177726f2848b64670c88437':
  Fix "error: 'strlen' was not declared in this scope".