Merge "System/root/shell need to explicitly ask for static libs to get them" into oc-dev