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

Change-Id: Ibd11be8b186991c6c1571e0b147a75cc44a95303