tree 3156fbd4d0e472d71c378c7425690c82da94599a
parent ea16a1f94fe60f0cc98311af096186d4b3329023
parent 02aaca663d47ebd440b5ec938da4117d72d16a5e
author Liz Kammer <eakammer@google.com> 1633536260 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633536260 +0000

Merge "Handle arch-variant in prebuilt_etc" am: ba26bdc316 am: 02aaca663d

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

Change-Id: Ie0ea862fc48d98155d98ac88a5194e9ccb2fda94