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

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



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