Enable multi-dex for dx am: 6b13ebc7f1
am: 5853282fa0

Change-Id: I7f7e5ed3a25e407f5ee5df1f1391014676673bdc