[automerger skipped] Merge "Use KNOWN_PACKAGES when shared lib consumers" am: 5bb655217d am: 4989c8886a -s ours
am skip reason: Change-Id Id4e37c3e4d3ea3ad5fddae5d2c7305e56f50eeea with SHA-1 34b504c32f is in history

Change-Id: I5842b3bb9098dd85aad57b90bfefa716abdf4be7