Merge "Revert "dexopt: Fix target-sdk-version argument creation""
am: 683f3188c9

Change-Id: I157f552d4a1f52fd85f64aa92096b6a44ee1b90b