Merge "Makes static shared libs visible to installer" into pi-dev