Merge "Provide an error message for missing dex-file arg."
am: b81c15ff8b

Change-Id: I1ad751525850d6177eb1edc1486d9361f3605670