Initial patch to include outside-project changes
shared lib ref to HHLL instead of static