Merge "Calculate package directory correctly in pip_install"