Merge "Refactor OptimizedBuildTarget and add general-tests optimization" into main am: 944fa4f8

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



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