Merge "Makes static shared libs visible to installer" into pi-dev
am: d79759a2d7

Change-Id: I610be30792c5e54e197ff4af4da244ace10e4721