Merge "Revert "Remove DX from the SDK""

build/sdk.atree

@@ -129,7 +129,9 @@ prebuilts/sdk/renderscript/lib/x86_64/librsrt_x86_64.bc     build-tools/${PLATFO
 bin/apksigner                                 build-tools/${PLATFORM_NAME}/apksigner
 framework/apksigner.jar                       build-tools/${PLATFORM_NAME}/lib/apksigner.jar
 
-# dexdump
+# dx
+bin/dx                                        build-tools/${PLATFORM_NAME}/dx
+framework/dx.jar                              build-tools/${PLATFORM_NAME}/lib/dx.jar
 bin/dexdump                                   build-tools/${PLATFORM_NAME}/dexdump
 
 # d8

sdk/sdk_files_NOTICE.txt

@@ -9738,6 +9738,7 @@ Notices for file(s):
 /bin/aapt
 /bin/aidl
 /bin/dexdump
+/bin/dx
 /bin/jasmin
 /bin/split-select
 /framework/android-mock-generatorlib.jar