Merge "Change JIT to not use PIC"