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

Change-Id: I2bc906adfa6c3724611bc66f12b0603f65b7f6e4