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