Merge "Test unwind through multidex"
am: 6fdd5068c9

Change-Id: I9c96a712b6b6889955ceb7c79c8cc9755c8f5b56