Merge "Remove DX from the SDK" am: a5b6f93ff2

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

Change-Id: Icfbf5bf6a2b8d535f3fb9f637c6cdfebf8172d12