Merge "Add args4j"
am: 8d8a185e0f

Change-Id: Ifeda94d3701f76ecbd81e8863d85080c09c64eaa