Merge "Show less ambiguous paths in the error when it fails to match the given...

Merge "Show less ambiguous paths in the error when it fails to match the given output file." am: bacf6a1a am: e5761207 am: 868d0520

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

Change-Id: If2b908a03ac5829af3292185d9e3277a20f0103e