Revert "Make it easier to locally unit test guest/host combined tracing"

This reverts commit 9ee90ceb9715808f7d28a360d7f3ed9aede2714d.

Reason for revert: build breakage on mac

Change-Id: If2d9e39f782ae0b60f27317c25f8135e98702867
3 files changed