Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"