Avoid a couple string copies

We use a const reference of std::string for a couple arguments to
minimize the number of extra copies made.

Test: TreeHugger
Bug: 197828948
Change-Id: I6691f5177eeb8907305cf25cac49dbe1c6820784
2 files changed