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

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

Change-Id: I72fc50c2336c6e1c5bb1d931b064d354cabaad5c