Merge "Fix issues with ARM/Thumb linking."