Merge "Support recursive static shared lib dependency" into oc-dev