Merge "Revert^2: dexopt: Fix target-sdk-version argument creation" am: e9d502a4d0
am: 459934e5cf

Change-Id: I7e76fe2fc69c3cafc2dde5a5b81000ff61772bcb