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

Change-Id: I8f64881df2599a2645d9bea757a97e9be7c3f21f