Merge "Add tests about MultiDex corruption recovering" am: 01e426d158
am: b319cca253

Change-Id: Ic754f70aa3c2d1202686e6ff80fc80e7040bb40d