Merge changes from topic "adbd_host" am: 3daa129a am: b7b7d08c am:...

Merge changes from topic "adbd_host" am: 3daa129a am: b7b7d08c am: 65e39939 am: bd5d4d63 am: f1ece801

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



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