Merge "Make Dx argument parser reusable." am: 5740e13fe1 am: 1e2dfa17cc am: 4ffd01c4f8
am: 70c0cb542b

Change-Id: Id68497b23a008f449ec11ac0af36f732682fbe96