am f23b47e9: am d8f4bfc7: (-s ours) Merge "Add tests for strcpy and strcat."

* commit 'f23b47e914b94faaa562306a37109125b7b90901':
  Add tests for strcpy and strcat.