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

Change-Id: I3d4aed414168711bb8dc1eaaa87b2c7cc6a25f5d