Revert^2 "Move Trace to use trampolines"

This reverts commit 27d85eaf.

An ancestor of the original CL got a typo put in it during a minor
refactor. This caused a check to be reversed and was not noticed since
it was a rebase.

Reason for revert:  Fixed issue causing --trace failures on some tests

Change-Id: I066519950294edae7b2c22a5850b4a9a96ba46c9
Test: ./test.py --host --trace --ntrace