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

Change-Id: Ib3318caab38902508fecd6bab9495189d661c695