Merge "Revert "Remove DX from the SDK"" am: 4e005d8a1c am: 783a0df53e

Original change: https://android-review.googlesource.com/c/platform/development/+/1679488

Change-Id: I1c500ba156de2b2f7f3a618189edc6707fb0af12