Merge "Support product-specific libraries" into pi-dev