Merge "Refactor dexopt command args"
am: d111162fc4

Change-Id: I5f36c311993cbe5472397330a5e831e379343485