Merge "Use dx.jar directly"