Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d' * commit 'f2cc2e522177683145b2daa0de0ed898b865824d': Get correct native library path on reinstall
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d' * commit 'f2cc2e522177683145b2daa0de0ed898b865824d': Get correct native library path on reinstall