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

Change-Id: Ia78496be5791c749539d5d58213bb85bfa05eb8e