Merge "Trampoline and assembly fixes for ARM64"