Imported Upstream version 3.1+20140723
Imported Upstream version 3.3-dev+20140728
Imported Upstream version 3.3+20140918
re-adding third-party

Change-Id: I384cb3ddf60ccd939fc955e6da1751d34fb3e9b9
Re-import third-party

Conflicts:
	third-party/CMakeLists.txt
	third-party/folly/CMakeLists.txt
	third-party/folly/src/README
	third-party/folly/src/folly/Arena.h
	third-party/folly/src/folly/AtomicBitSet.h
	third-party/folly/src/folly/AtomicHashArray-inl.h
	third-party/folly/src/folly/AtomicHashArray.h
	third-party/folly/src/folly/AtomicHashMap-inl.h
	third-party/folly/src/folly/AtomicHashMap.h
	third-party/folly/src/folly/Baton.h
	third-party/folly/src/folly/Benchmark.h
	third-party/folly/src/folly/Bits.cpp
	third-party/folly/src/folly/Bits.h
	third-party/folly/src/folly/Checksum.cpp
	third-party/folly/src/folly/Chrono.h
	third-party/folly/src/folly/ConcurrentSkipList-inl.h
	third-party/folly/src/folly/ConcurrentSkipList.h
	third-party/folly/src/folly/Conv.cpp
	third-party/folly/src/folly/Conv.h
	third-party/folly/src/folly/CpuId.h
	third-party/folly/src/folly/Demangle.cpp
	third-party/folly/src/folly/Demangle.h
	third-party/folly/src/folly/DiscriminatedPtr.h
	third-party/folly/src/folly/DynamicConverter.h
	third-party/folly/src/folly/Exception.h
	third-party/folly/src/folly/ExceptionWrapper.h
	third-party/folly/src/folly/FBString.h
	third-party/folly/src/folly/FBVector.h
	third-party/folly/src/folly/File.cpp
	third-party/folly/src/folly/File.h
	third-party/folly/src/folly/FileUtil.cpp
	third-party/folly/src/folly/FileUtil.h
	third-party/folly/src/folly/Fingerprint.h
	third-party/folly/src/folly/Format-inl.h
	third-party/folly/src/folly/Format.cpp
	third-party/folly/src/folly/Format.h
	third-party/folly/src/folly/FormatArg.h
	third-party/folly/src/folly/GroupVarint.cpp
	third-party/folly/src/folly/GroupVarint.h
	third-party/folly/src/folly/Hash.h
	third-party/folly/src/folly/IPAddress.cpp
	third-party/folly/src/folly/IPAddress.h
	third-party/folly/src/folly/IPAddressException.h
	third-party/folly/src/folly/IPAddressV4.cpp
	third-party/folly/src/folly/IPAddressV4.h
	third-party/folly/src/folly/IPAddressV6.cpp
	third-party/folly/src/folly/IPAddressV6.h
	third-party/folly/src/folly/IndexedMemPool.h
	third-party/folly/src/folly/Lazy.h
	third-party/folly/src/folly/LifoSem.h
	third-party/folly/src/folly/Logging.h
	third-party/folly/src/folly/MPMCPipeline.h
	third-party/folly/src/folly/MacAddress.cpp
	third-party/folly/src/folly/MacAddress.h
	third-party/folly/src/folly/Makefile.am
	third-party/folly/src/folly/Malloc.cpp
	third-party/folly/src/folly/Malloc.h
	third-party/folly/src/folly/Memory.h
	third-party/folly/src/folly/MemoryMapping.cpp
	third-party/folly/src/folly/MemoryMapping.h
	third-party/folly/src/folly/Optional.h
	third-party/folly/src/folly/PackedSyncPtr.h
	third-party/folly/src/folly/Padded.h
	third-party/folly/src/folly/Portability.h
	third-party/folly/src/folly/RWSpinLock.h
	third-party/folly/src/folly/Random-inl.h
	third-party/folly/src/folly/Random.cpp
	third-party/folly/src/folly/Random.h
	third-party/folly/src/folly/Range.cpp
	third-party/folly/src/folly/Range.h
	third-party/folly/src/folly/SafeAssert.cpp
	third-party/folly/src/folly/SafeAssert.h
	third-party/folly/src/folly/ScopeGuard.h
	third-party/folly/src/folly/SmallLocks.h
	third-party/folly/src/folly/SpookyHashV1.cpp
	third-party/folly/src/folly/SpookyHashV2.cpp
	third-party/folly/src/folly/String-inl.h
	third-party/folly/src/folly/String.cpp
	third-party/folly/src/folly/String.h
	third-party/folly/src/folly/Subprocess.cpp
	third-party/folly/src/folly/Subprocess.h
	third-party/folly/src/folly/Synchronized.h
	third-party/folly/src/folly/ThreadCachedArena.cpp
	third-party/folly/src/folly/ThreadCachedArena.h
	third-party/folly/src/folly/ThreadCachedInt.h
	third-party/folly/src/folly/ThreadLocal.h
	third-party/folly/src/folly/TimeoutQueue.cpp
	third-party/folly/src/folly/Traits.h
	third-party/folly/src/folly/Unicode.cpp
	third-party/folly/src/folly/Unicode.h
	third-party/folly/src/folly/Uri-inl.h
	third-party/folly/src/folly/Uri.cpp
	third-party/folly/src/folly/Uri.h
	third-party/folly/src/folly/Varint.h
	third-party/folly/src/folly/build/GenerateFingerprintTables.cpp
	third-party/folly/src/folly/build/generate_format_tables.py
	third-party/folly/src/folly/build/generate_varint_tables.py
	third-party/folly/src/folly/configure.ac
	third-party/folly/src/folly/detail/BitsDetail.h
	third-party/folly/src/folly/detail/CacheLocality.cpp
	third-party/folly/src/folly/detail/CacheLocality.h
	third-party/folly/src/folly/detail/Clock.cpp
	third-party/folly/src/folly/detail/Clock.h
	third-party/folly/src/folly/detail/FunctionalExcept.cpp
	third-party/folly/src/folly/detail/FunctionalExcept.h
	third-party/folly/src/folly/detail/IPAddress.h
	third-party/folly/src/folly/detail/MPMCPipelineDetail.h
	third-party/folly/src/folly/detail/Malloc.h
	third-party/folly/src/folly/detail/MallocImpl.cpp
	third-party/folly/src/folly/detail/SlowFingerprint.h
	third-party/folly/src/folly/detail/ThreadLocalDetail.h
	third-party/folly/src/folly/docs/Format.md
	third-party/folly/src/folly/dynamic-inl.h
	third-party/folly/src/folly/dynamic.cpp
	third-party/folly/src/folly/dynamic.h
	third-party/folly/src/folly/experimental/Bits.h
	third-party/folly/src/folly/experimental/EliasFanoCoding.h
	third-party/folly/src/folly/experimental/EventCount.h
	third-party/folly/src/folly/experimental/TestUtil.cpp
	third-party/folly/src/folly/experimental/TestUtil.h
	third-party/folly/src/folly/experimental/exception_tracer/ExceptionTracer.cpp
	third-party/folly/src/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
	third-party/folly/src/folly/experimental/exception_tracer/ExceptionTracerLib.cpp
	third-party/folly/src/folly/experimental/exception_tracer/ExceptionTracerTest.cpp
	third-party/folly/src/folly/experimental/exception_tracer/StackTrace.cpp
	third-party/folly/src/folly/experimental/io/AsyncIO.cpp
	third-party/folly/src/folly/experimental/io/AsyncIO.h
	third-party/folly/src/folly/experimental/io/FsUtil.cpp
	third-party/folly/src/folly/experimental/io/HugePageUtil.cpp
	third-party/folly/src/folly/experimental/io/HugePages.cpp
	third-party/folly/src/folly/experimental/io/HugePages.h
	third-party/folly/src/folly/experimental/io/test/AsyncIOTest.cpp
	third-party/folly/src/folly/experimental/io/test/FsUtilTest.cpp
	third-party/folly/src/folly/experimental/symbolizer/Dwarf.cpp
	third-party/folly/src/folly/experimental/symbolizer/Dwarf.h
	third-party/folly/src/folly/experimental/symbolizer/Elf.cpp
	third-party/folly/src/folly/experimental/symbolizer/Elf.h
	third-party/folly/src/folly/experimental/symbolizer/ElfCache.cpp
	third-party/folly/src/folly/experimental/symbolizer/ElfCache.h
	third-party/folly/src/folly/experimental/symbolizer/ElfUtil.cpp
	third-party/folly/src/folly/experimental/symbolizer/LineReader.cpp
	third-party/folly/src/folly/experimental/symbolizer/LineReader.h
	third-party/folly/src/folly/experimental/symbolizer/SignalHandler.cpp
	third-party/folly/src/folly/experimental/symbolizer/StackTrace.cpp
	third-party/folly/src/folly/experimental/symbolizer/Symbolizer.cpp
	third-party/folly/src/folly/experimental/symbolizer/Symbolizer.h
	third-party/folly/src/folly/experimental/symbolizer/test/Crash.cpp
	third-party/folly/src/folly/experimental/symbolizer/test/ElfTests.cpp
	third-party/folly/src/folly/experimental/symbolizer/test/LineReaderTest.cpp
	third-party/folly/src/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
	third-party/folly/src/folly/experimental/symbolizer/test/StackTraceTest.cpp
	third-party/folly/src/folly/experimental/symbolizer/test/SymbolizerTest.cpp
	third-party/folly/src/folly/experimental/test/BitsBenchmark.cpp
	third-party/folly/src/folly/experimental/test/BitsTest.cpp
	third-party/folly/src/folly/experimental/test/CodingTestUtils.h
	third-party/folly/src/folly/experimental/test/EliasFanoCodingTest.cpp
	third-party/folly/src/folly/experimental/test/EventCountTest.cpp
	third-party/folly/src/folly/experimental/test/TestUtilTest.cpp
	third-party/folly/src/folly/gen/Base-inl.h
	third-party/folly/src/folly/gen/Base.h
	third-party/folly/src/folly/gen/Combine.h
	third-party/folly/src/folly/gen/Core.h
	third-party/folly/src/folly/gen/File-inl.h
	third-party/folly/src/folly/gen/File.h
	third-party/folly/src/folly/gen/Parallel-inl.h
	third-party/folly/src/folly/gen/Parallel.h
	third-party/folly/src/folly/gen/ParallelMap-inl.h
	third-party/folly/src/folly/gen/ParallelMap.h
	third-party/folly/src/folly/gen/String-inl.h
	third-party/folly/src/folly/gen/String.h
	third-party/folly/src/folly/gen/test/BaseBenchmark.cpp
	third-party/folly/src/folly/gen/test/BaseTest.cpp
	third-party/folly/src/folly/gen/test/Bench.h
	third-party/folly/src/folly/gen/test/CombineTest.cpp
	third-party/folly/src/folly/gen/test/FileBenchmark.cpp
	third-party/folly/src/folly/gen/test/FileTest.cpp
	third-party/folly/src/folly/gen/test/ParallelBenchmark.cpp
	third-party/folly/src/folly/gen/test/ParallelMapBenchmark.cpp
	third-party/folly/src/folly/gen/test/ParallelMapTest.cpp
	third-party/folly/src/folly/gen/test/ParallelTest.cpp
	third-party/folly/src/folly/gen/test/StringBenchmark.cpp
	third-party/folly/src/folly/gen/test/StringTest.cpp
	third-party/folly/src/folly/io/Compression.cpp
	third-party/folly/src/folly/io/Compression.h
	third-party/folly/src/folly/io/Cursor.h
	third-party/folly/src/folly/io/IOBuf.cpp
	third-party/folly/src/folly/io/IOBuf.h
	third-party/folly/src/folly/io/IOBufQueue.cpp
	third-party/folly/src/folly/io/IOBufQueue.h
	third-party/folly/src/folly/io/RecordIO-inl.h
	third-party/folly/src/folly/io/RecordIO.cpp
	third-party/folly/src/folly/io/RecordIO.h
	third-party/folly/src/folly/io/TypedIOBuf.h
	third-party/folly/src/folly/io/async/AsyncTimeout.cpp
	third-party/folly/src/folly/io/async/AsyncTimeout.h
	third-party/folly/src/folly/io/async/EventBase.cpp
	third-party/folly/src/folly/io/async/EventBase.h
	third-party/folly/src/folly/io/async/EventHandler.cpp
	third-party/folly/src/folly/io/async/EventHandler.h
	third-party/folly/src/folly/io/async/NotificationQueue.h
	third-party/folly/src/folly/io/async/Request.cpp
	third-party/folly/src/folly/io/async/Request.h
	third-party/folly/src/folly/io/test/CompressionTest.cpp
	third-party/folly/src/folly/io/test/IOBufCursorTest.cpp
	third-party/folly/src/folly/io/test/IOBufQueueTest.cpp
	third-party/folly/src/folly/io/test/IOBufTest.cpp
	third-party/folly/src/folly/io/test/NetworkBenchmark.cpp
	third-party/folly/src/folly/io/test/RecordIOTest.cpp
	third-party/folly/src/folly/json.cpp
	third-party/folly/src/folly/json.h
	third-party/folly/src/folly/small_vector.h
	third-party/folly/src/folly/sorted_vector_types.h
	third-party/folly/src/folly/stats/BucketedTimeSeries-defs.h
	third-party/folly/src/folly/stats/BucketedTimeSeries.h
	third-party/folly/src/folly/stats/Histogram-defs.h
	third-party/folly/src/folly/stats/Histogram.h
	third-party/folly/src/folly/stats/Instantiations.cpp
	third-party/folly/src/folly/stats/MultiLevelTimeSeries-defs.h
	third-party/folly/src/folly/stats/MultiLevelTimeSeries.h
	third-party/folly/src/folly/stats/TimeseriesHistogram-defs.h
	third-party/folly/src/folly/stats/TimeseriesHistogram.h
	third-party/folly/src/folly/test/AHMIntStressTest.cpp
	third-party/folly/src/folly/test/ApplyTupleTest.cpp
	third-party/folly/src/folly/test/ArenaSmartPtrTest.cpp
	third-party/folly/src/folly/test/ArenaTest.cpp
	third-party/folly/src/folly/test/AsciiCaseInsensitiveBenchmark.cpp
	third-party/folly/src/folly/test/AsciiCaseInsensitiveTest.cpp
	third-party/folly/src/folly/test/AtomicBitSetTest.cpp
	third-party/folly/src/folly/test/AtomicHashArrayTest.cpp
	third-party/folly/src/folly/test/AtomicHashMapTest.cpp
	third-party/folly/src/folly/test/AtomicStructTest.cpp
	third-party/folly/src/folly/test/BatonTest.cpp
	third-party/folly/src/folly/test/BenchmarkTest.cpp
	third-party/folly/src/folly/test/BitIteratorTest.cpp
	third-party/folly/src/folly/test/BitsTest.cpp
	third-party/folly/src/folly/test/CacheLocalityTest.cpp
	third-party/folly/src/folly/test/ChecksumTest.cpp
	third-party/folly/src/folly/test/ConcurrentSkipListBenchmark.cpp
	third-party/folly/src/folly/test/ConcurrentSkipListTest.cpp
	third-party/folly/src/folly/test/ConvTest.cpp
	third-party/folly/src/folly/test/CpuIdTest.cpp
	third-party/folly/src/folly/test/DeterministicScheduleTest.cpp
	third-party/folly/src/folly/test/DiscriminatedPtrTest.cpp
	third-party/folly/src/folly/test/DynamicConverterTest.cpp
	third-party/folly/src/folly/test/DynamicTest.cpp
	third-party/folly/src/folly/test/EndianTest.cpp
	third-party/folly/src/folly/test/ExceptionTest.cpp
	third-party/folly/src/folly/test/ExceptionWrapperBenchmark.cpp
	third-party/folly/src/folly/test/ExceptionWrapperTest.cpp
	third-party/folly/src/folly/test/FBStringBenchmark.cpp
	third-party/folly/src/folly/test/FBStringTest.cpp
	third-party/folly/src/folly/test/FBVectorBenchmark.cpp
	third-party/folly/src/folly/test/FBVectorTest.cpp
	third-party/folly/src/folly/test/FileTest.cpp
	third-party/folly/src/folly/test/FileTestLockHelper.cpp
	third-party/folly/src/folly/test/FileUtilTest.cpp
	third-party/folly/src/folly/test/FingerprintTest.cpp
	third-party/folly/src/folly/test/ForeachTest.cpp
	third-party/folly/src/folly/test/FormatBenchmark.cpp
	third-party/folly/src/folly/test/FormatTest.cpp
	third-party/folly/src/folly/test/FutexTest.cpp
	third-party/folly/src/folly/test/GroupVarintTest.cpp
	third-party/folly/src/folly/test/HasMemberFnTraitsTest.cpp
	third-party/folly/src/folly/test/HashTest.cpp
	third-party/folly/src/folly/test/HistogramBenchmark.cpp
	third-party/folly/src/folly/test/HistogramTest.cpp
	third-party/folly/src/folly/test/IPAddressTest.cpp
	third-party/folly/src/folly/test/IPAddressTest.h
	third-party/folly/src/folly/test/IndexedMemPoolTest.cpp
	third-party/folly/src/folly/test/JsonTest.cpp
	third-party/folly/src/folly/test/LazyTest.cpp
	third-party/folly/src/folly/test/LifoSemTests.cpp
	third-party/folly/src/folly/test/LoggingTest.cpp
	third-party/folly/src/folly/test/MPMCPipelineTest.cpp
	third-party/folly/src/folly/test/MPMCQueueTest.cpp
	third-party/folly/src/folly/test/MacAddressTest.cpp
	third-party/folly/src/folly/test/Makefile.am
	third-party/folly/src/folly/test/MapUtilTest.cpp
	third-party/folly/src/folly/test/MemoryIdlerTest.cpp
	third-party/folly/src/folly/test/MemoryMappingTest.cpp
	third-party/folly/src/folly/test/MemoryTest.cpp
	third-party/folly/src/folly/test/MergeTest.cpp
	third-party/folly/src/folly/test/MoveWrapperTest.cpp
	third-party/folly/src/folly/test/OptionalTest.cpp
	third-party/folly/src/folly/test/PackedSyncPtrTest.cpp
	third-party/folly/src/folly/test/PaddedTest.cpp
	third-party/folly/src/folly/test/PortabilityTest.cpp
	third-party/folly/src/folly/test/ProducerConsumerQueueBenchmark.cpp
	third-party/folly/src/folly/test/ProducerConsumerQueueTest.cpp
	third-party/folly/src/folly/test/RWSpinLockTest.cpp
	third-party/folly/src/folly/test/RandomTest.cpp
	third-party/folly/src/folly/test/RangeFindBenchmark.cpp
	third-party/folly/src/folly/test/RangeTest.cpp
	third-party/folly/src/folly/test/SafeAssertTest.cpp
	third-party/folly/src/folly/test/ScopeGuardTest.cpp
	third-party/folly/src/folly/test/SmallLocksTest.cpp
	third-party/folly/src/folly/test/SpookyHashV1Test.cpp
	third-party/folly/src/folly/test/SpookyHashV2Test.cpp
	third-party/folly/src/folly/test/StringTest.cpp
	third-party/folly/src/folly/test/SubprocessTest.cpp
	third-party/folly/src/folly/test/SubprocessTestParentDeathHelper.cpp
	third-party/folly/src/folly/test/SynchronizedTest.cpp
	third-party/folly/src/folly/test/SynchronizedTestLib-inl.h
	third-party/folly/src/folly/test/SynchronizedTestLib.h
	third-party/folly/src/folly/test/ThreadCachedArenaTest.cpp
	third-party/folly/src/folly/test/ThreadCachedIntTest.cpp
	third-party/folly/src/folly/test/ThreadLocalTest.cpp
	third-party/folly/src/folly/test/TimeoutQueueTest.cpp
	third-party/folly/src/folly/test/TimeseriesBenchmark.cpp
	third-party/folly/src/folly/test/TimeseriesHistogramTest.cpp
	third-party/folly/src/folly/test/TimeseriesTest.cpp
	third-party/folly/src/folly/test/TraitsTest.cpp
	third-party/folly/src/folly/test/UriTest.cpp
	third-party/folly/src/folly/test/VarintTest.cpp
	third-party/folly/src/folly/test/small_vector_test.cpp
	third-party/folly/src/folly/test/sorted_vector_test.cpp
	third-party/folly/src/folly/test/stl_tests/StlVectorTest.cpp
	third-party/folly/src/folly/wangle/Executor.h
	third-party/folly/src/folly/wangle/Future-inl.h
	third-party/folly/src/folly/wangle/Future.h
	third-party/folly/src/folly/wangle/InlineExecutor.h
	third-party/folly/src/folly/wangle/Later-inl.h
	third-party/folly/src/folly/wangle/Later.h
	third-party/folly/src/folly/wangle/ManualExecutor.h
	third-party/folly/src/folly/wangle/Promise-inl.h
	third-party/folly/src/folly/wangle/Promise.h
	third-party/folly/src/folly/wangle/QueuedImmediateExecutor.cpp
	third-party/folly/src/folly/wangle/QueuedImmediateExecutor.h
	third-party/folly/src/folly/wangle/README.md
	third-party/folly/src/folly/wangle/ThreadGate.h
	third-party/folly/src/folly/wangle/test/ExecutorTest.cpp
	third-party/folly/src/folly/wangle/test/FutureTest.cpp
	third-party/folly/src/folly/wangle/test/LaterTest.cpp
	third-party/folly/src/folly/wangle/test/Thens.h
	third-party/folly/src/folly/wangle/test/ThreadGateTest.cpp
	third-party/folly/src/folly/wangle/test/Try.cpp
	third-party/libzip/CMakeLists.txt
	third-party/libzip/cmake-zipconf.h.in
	third-party/lz4/lz4.c
	third-party/lz4/lz4.h
	third-party/lz4/lz4hc.c
	third-party/lz4/lz4hc.h
	third-party/proxygen/CMakeLists.txt
	third-party/proxygen/lib/services/ManagedConnection.h
	third-party/proxygen/lib/services/TcpEventsConfig.h
	third-party/proxygen/lib/transport/TransportInfo.cpp
	third-party/proxygen/lib/transport/TransportInfo.h
	third-party/proxygen/lib/utils/SocketOptions.h
	third-party/proxygen/lib/utils/Time.h
	third-party/proxygen/lib/workers/WorkerThread.h
	third-party/thrift/lib/cpp/async/TEventBase.h
	third-party/thrift/lib/cpp/concurrency/ThreadManager.h
	third-party/thrift/lib/cpp/config.h

Change-Id: I796f20707d464530dcd64fc3ac8a4ba3aafa5a2a