Merge "Use KNOWN_PACKAGES when shared lib consumers"
am: 5bb655217d

Change-Id: Iad6d7ec5e804fbd364b1dd5bf89ec526ae912132