Merge "Remove DX from the SDK" am: 5064ab0df2

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

Change-Id: Ia8522af586563bc04c6adc5316aaf4cce729a251