Merge "Cleanup the list of Soong prebuilt module types." am: 269248ad am:...

Merge "Cleanup the list of Soong prebuilt module types." am: 269248ad am: 6a2b03ba am: 6117ec0e am: a7749018

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



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