Enable multi-dex for dx
am: 6b13ebc7f1

Change-Id: I78486dd1d460673ae25c80994b474cf8a044b660