Merge "STT: combined build supports more targets to build" into main am: 795b8b2e6f

Original change: https://android-review.googlesource.com/c/platform/development/+/2722733

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