Merge "Revert^2: dexopt: Fix target-sdk-version argument creation"