Merge "Revert "Move Trace to use trampolines""
am: 23b8f0d6ca

Change-Id: Icfe9df5f5f8fc58ef1ae7251ec23063936c59e32