Merge "Fix Thread offsets for ARM64 assembly"