Non-module target. am: 8f813ef58e am: 0c53c9ffc5 am: bf3a5cdb58 am: 96a2263b65 am: 2c591bef43

Original change: https://android-review.googlesource.com/c/platform/prebuilts/asuite/+/2052099

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