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

Change-Id: I694f7c0d255c40a243dd477200cb2cb6b7d22613