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

Change-Id: I5c146f98e327b12bf9d3de2fbe98914aead74d03