tree 6ee8e119f27c8883a5ecff7c89b8bc7320ede1af
parent 429f29b360a48b6b9700f5e1c3ef3ab7c83426b3
parent 1678ccaeaaa18d95b28898f05df0b53b4cf1114f
author Matthew Maurer <mmaurer@google.com> 1629343705 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629343705 +0000

Merge changes I9682b978,I35465715,I9c5aa5f3,I1c76e620 am: a8b1ab0370 am: 1678ccaeaa

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

Change-Id: Ife947e6cb9e32451c6d1203d117862aa00bb028c