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

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



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