This commit fixes up shared lib builds on linux.

Change-Id: Ib109dc5a226dc5d7874d2e5b333466cbfd4f4661