Deshim //folly:dynamic to //folly/json:dynamic in watchman

Summary:
The following headers were shimmed in //folly:dynamic and were modded:
  - folly/DynamicConverter.h -> folly/json/DynamicConverter.h
  - folly/dynamic.h -> folly/json/dynamic.h
  - folly/dynamic-inl.h -> folly/json/dynamic-inl.h
  - folly/json.h -> folly/json/json.h

`arc lint` was applied

Reviewed By: MichaelCuevas

Differential Revision: D53837653

fbshipit-source-id: 871dc362779e3de73107e8dc0508234a42b09122

watchman/cppclient/CLI.cpp

@@ -25,7 +25,7 @@
 
 #include <folly/init/Init.h>
 #include <folly/io/async/ScopedEventBaseThread.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 
 using namespace folly;
 using namespace watchman;

watchman/cppclient/WatchmanClient.h

@@ -74,8 +74,8 @@
 #include <folly/Executor.h>
 #include <folly/Optional.h>
 #include <folly/Try.h>
-#include <folly/dynamic.h>
 #include <folly/futures/Future.h>
+#include <folly/json/dynamic.h>
 
 namespace watchman {
 

watchman/cppclient/WatchmanConnection.h

@@ -13,11 +13,11 @@
 #include <optional>
 
 #include <folly/ExceptionWrapper.h>
-#include <folly/dynamic.h>
 #include <folly/futures/Future.h>
 #include <folly/io/IOBufQueue.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/json/dynamic.h>
 
 namespace watchman {
 

watchman/integration/cppclient.cpp

@@ -17,7 +17,7 @@
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/init/Init.h>
 #include <folly/io/async/EventBaseThread.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 #include <glog/logging.h>
 
 using namespace folly;