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

Change-Id: If43f081cd9349152fb808cadc47fb9f35ddb3ce6