Merge "Fix handling for partial cdex conversion rejection in multidex"
am: 78d627ded3

Change-Id: Id59cf30921ccd0beb301a45b003e6f480aa93dd7