Merge "Query for static shared libs as well when needed" into oc-dev