Merge "Switch x86/x64 trampolines to use __attribute__((naked))" into pi-dev