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

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

Change-Id: I409cfd6133c038ca14578a64428062a2ce4d2309