Merge "Revert^2 "Slim down the sdk product"" am: eb483046 am: 12ddff02

Original change: https://android-review.googlesource.com/c/platform/build/+/2101190



Change-Id: Idb5f5d17681f1161fb65b0409ed0c9e5df6424e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>