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

Change-Id: I5cb8d5afe8e95951a239d722368f3bc112ad8294