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

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

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