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

Change-Id: I13c714cca2334adecf5073829bcfdbbc19b69d59