Merge "Rename -Xjit / -Xnojit options to -Xusejit:<boolean>"