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

Change-Id: I68e438ff0d9a0963c4ba5c796b5af4c34ec96def