Merge "Revert "Move Trace to use trampolines"" am: 23b8f0d6ca am: 121a6b8a5a
am: 483d915296

Change-Id: I408c2ca6c66b7fb1b8593d928062c153657b0716