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

Change-Id: I1d08c0606f2380e33319d92e60ad4503fe7eca75