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

Change-Id: I69401de49941cad023a220b90f53ea359cb256b4