Merge "Revert "Quick Compiler: fix Arm cts failures""