Merge "Refactor dexopt command args" am: d111162fc4
am: e3fbd72fdd

Change-Id: I645baec933ecd7606c7af5ca0b08cc84791f9da4