Merge "Revert "Use dx.jar directly""