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

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

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