Merge "Slim down the sdk product" am: 8033f34e am: b68586f0 am: 8a67ba2f

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



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