Merge "Cleanup in StubLibraries.bp"