Merge "Make Dx argument parser reusable." am: 5740e13fe1
am: 1e2dfa17cc

Change-Id: I0b6fef0c2f8463f79040dbda9d8d728b60262261