Merge "Derive library path for upgraded system apps."