Merge "Change phony targets to set dalvik.vm.usejit properly"