static linking fixed

Change-Id: Ib825adf0737cc211f2e70470b5ae53eced3af25c