Merge "Test unwind through multidex" am: 6fdd5068c9
am: dd8f577dbe

Change-Id: I3d82207a234c4ab6795cd640bab66810a35b6f7d