Merge "Fix overlaying shared libraries" into rvc-dev