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

Change-Id: Id9b8a61019dc23ebf8524a8d599db813090b128e