Merge "Change flush order in JIT code cache"