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

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



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