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

Change-Id: I7a0b0157b85dc6f2b42ccf3cf87763a86ee651ff