Merge "Revert "Slim down the sdk product"" am: 3a294b6c am: 3e78c037 am: 4224a5a8

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



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