tree 6ee8e119f27c8883a5ecff7c89b8bc7320ede1af
parent 1637e4345f0987ab60a2147122506bc6b0a98d79
parent 6f16bf821270e2bd5a24f9747bbb04c78a7d322c
author Matthew Maurer <mmaurer@google.com> 1629345812 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629345812 +0000

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

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

Change-Id: Ic38ff03d3992c5bb46b4d1dff77f99e9c5f1dd0f