Merge "BuildSystem: Invoke ldconfig with previous path."