[automerger skipped] Support product-specific libraries
am: e5c2de355b  -s ours

Change-Id: I05b8bdd8425f62b670986b7653ed211426d7406a