am ac2518d1: (-s ours) Merge "Add strlen tests. DO NOT MERGE"

* commit 'ac2518d13b67d682a59bb070f9971549dcca7249':
  Add strlen tests. DO NOT MERGE