tree b486265ffea05271ce54f140e17f14f1e392305f
parent b6289005daab082ce136f76e0dff7a02e4e99273
parent fed3551805d27324625799cf656d554597bbe1b5
author Paul Duffin <paulduffin@google.com> 1635538365 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635538365 +0000

Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a am: fed3551805

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

Change-Id: If7edc3a99f09c61806f1e010f88aa06f18e004f6