Merge "Remove .arch directives from spinlock.S" into integration