Merge "Added option to use dx in dexfuzz testing as well."
am: bdd827280a

Change-Id: I5f3daded274d6d59012b79ef33702ae5a799a227