Merge "Revert "Update use of $(DX)""
am: 7753d32c9c

Change-Id: Id0f673630d44efc3a1fefe8b2d17e5c81275a1fa