Merge "Cleanup verify_overlaps*.py" am: 6f041b56

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



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