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

Change-Id: I1166aba96ab46b9426fc1cfae15e7329df38717f