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

Change-Id: Ic84190aa2129ec74b39d6eda931fe7c720b6ea98