Merge "Show less ambiguous paths in the error when it fails to match the given output file." am: bacf6a1a6a am: e576120738

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

Change-Id: I84addb47dfd2aedb35fd09ba6c3bc3712a9820c8