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