Adjust lib part for usage without make install

Change-Id: Ic826193d419adefcebbac4c47dd1ebdcb6dcdb45