Merge "Depend on dx binary directly" am: 252eda65ae
am: 6e06e1c163

Change-Id: I25f1f0de9dbabf84def2d039261d3f4ad9d40c33