Merge "Use named options for verify_overlaps" am: 510a5e05 am: 0971c66d am: 965a6b6a

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



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