Merge "Remove DX from the SDK" am: a5b6f93ff2 am: a2c173be97

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

Change-Id: I87607925cb4b3d7705d20ae4a8e40e9a358fa964