Merge "dexopt: Fix target-sdk-version argument creation"