Merge changes from topic "remove_suffixes" am: a3219265 am: 38811402 am:...

Merge changes from topic "remove_suffixes" am: a3219265 am: 38811402 am: 1a79e2e8 am: a37eb7e5 am: 405253ed am: 37254c09

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



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