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

Merge "Revert^2 "Slim down the sdk product"" am: eb483046 am: 12ddff02 am: 98550308 am: 187a64fd am: b919ece5

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



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