Merge pull request #15247 from wtgodbe/TestNativeBinLocation