Merge "Recover vdex regression on multidex."
am: d0176f5ddd

Change-Id: Idb8510c80d4e64082d6eb92d706fac58e3accd8c