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

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

Change-Id: I247387b90d0508e22f24adb941b005b5a5df1b7e