Merge changes If4bf6e86,I9c7fbd76

* changes:
  Plumb DexOptions through to Simulator
  Reflow dx help text