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

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

Change-Id: I8e5940a3297dbae3a61c91c341a02b2aca9e0ead