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

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

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



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