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

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

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