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