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

* commit '29bbea5002fabf9631310bc61b425b3356cd9e82':
  Add strlen tests. DO NOT MERGE