Merge "Adding a filepath to unbundled_visibility" am: 22a61ed9c9

Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1347931

Change-Id: I440d9e3bc59b873954731afad3c8aa7ba781a6b3