Merge "Support product-specific libraries"