more support for shared libs

Change-Id: I0555d033e6a515809ed9fd984ec216a26438c0cc