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

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

Change-Id: Ie73fafb5923760e30d96890a3ff5389a51072028