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

Change-Id: Ia50214ef1eebff31b3507aae1a9c0116f5df8af9