[automerger skipped] Merge "Support product-specific libraries" into pi-dev am: f88508898c  -s ours
am: 460948be8d  -s ours

Change-Id: I0d8399f1a5cdf81c5f2fbda7a00b55a5701fd190