Revert "Matcher: Avoid excessive String copies."

This reverts commit 903563600f39b4efdf22a179f0d270e4d2a72469.

Reason for revert: this results in sporadic crashes on
host/x86.

Change-Id: Ibb914b298df0e814a8684904b118fbaa8b8cab2c
bug: 36366255
3 files changed