Merge "Support product-specific libraries"
am: 39cab7cd25

Change-Id: Iece0f58e9875a4af43c6d646dc71075c2c83a0d0