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

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

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