Merge changes from topic "restructure-adb.py" am: bf8030234b am: a6ed1573c6 am: c7e961ef31

Original change: https://android-review.googlesource.com/c/platform/development/+/2363015

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