Merge "Add missing JIT stuff in make files"