Fix multiple includes

Summary:
Add nolint comments to appropriate multiply-included files.
Removed raw duplicates from StlVectorTest.

Test Plan:
fbconfig -r folly && fbmake runtests

Ran arc lint, see no "included multiple times" messages

Reviewed By: robbert@fb.com

Subscribers: sdwilsh, njormrod, folly-diffs@

FB internal diff: D1644144

Tasks: 5486739

Signature: t1:1644144:1414599280:1e403ea3675d2173b249c4ce6db0dad621a139bc

folly/FBString.h

@@ -36,9 +36,9 @@
 // either before or after this inclusion.
 #ifdef FOLLY_MALLOC_H_
 #undef FOLLY_MALLOC_H_
-#include "basic_fbstring_malloc.h"
+#include "basic_fbstring_malloc.h" // nolint
 #else
-#include "basic_fbstring_malloc.h"
+#include "basic_fbstring_malloc.h" // nolint
 #undef FOLLY_MALLOC_H_
 #endif
 

folly/test/FBStringBenchmark.cpp

@@ -86,10 +86,10 @@ std::list<char> RandomList(unsigned int maxSize) {
 #define BENCHFUN(F) CONCAT(CONCAT(BM_, F), CONCAT(_, STRING))
 
 #define STRING string
-#include <folly/test/FBStringTestBenchmarks.cpp.h>
+#include <folly/test/FBStringTestBenchmarks.cpp.h> // nolint
 #undef STRING
 #define STRING fbstring
-#include <folly/test/FBStringTestBenchmarks.cpp.h>
+#include <folly/test/FBStringTestBenchmarks.cpp.h> // nolint
 #undef STRING
 
 int main(int argc, char** argv) {

folly/test/FBVectorBenchmark.cpp

@@ -93,16 +93,16 @@ typedef vector<folly::fbstring> FBStringVector;
 typedef fbvector<folly::fbstring> FBStringFBVector;
 
 #define VECTOR IntVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 #define VECTOR IntFBVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 #define VECTOR FBStringVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 #define VECTOR FBStringFBVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 
 int main(int argc, char** argv) {

folly/test/stl_tests/StlVectorTest.cpp

@@ -2729,9 +2729,6 @@ int main(int argc, char** argv) {
 
 #else // GCC 4.7 guard
 
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
-
 // do nothing
 TEST(placeholder, gccversion) {}