Changes to use SAP solver

[yangwill]

updates to newest drake master and also adds new distance constraints when sap is chosen as the discrete contact solver

---

This change is