Change build targets for building mainline module am: 8f1105d0b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/asuite/+/19694318

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