Merge "Depend on dx binary directly"