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

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