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

Change-Id: I83d61bc596a40b030cae56a5b9c4565b05daca9a