Merge "Hadler USER_ALL when uninstalling static shared lib" into oc-dev