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

Change-Id: Ie1e926d8fe8b73ea98d2df0a8efc91eb26e1fde9