Merge branch 'chrome/m56' into update-m56

 - there is something wrong since there are missing files...

diff --cc bench/nanobench.cpp
Simple merge

diff --cc dm/DM.cpp
index 53709ba,d42a5f0..cc4c2a5
--- 1/dm/DM.cpp
--- 2/dm/DM.cpp
+++ b/dm/DM.cpp
@@@ -34,7 -35,10 +35,9 @@@
  #include "Timer.h"
  #include "picture_utils.h"
  #include "sk_tool_utils.h"
 -#include "SkScan.h"
  
+ #include <vector>
+ 
  #ifdef SK_PDF_IMAGE_STATS
  extern void SkPDFImageDumpStats();
  #endif

diff --cc gyp/common_conditions.gypi
Simple merge

diff --cc gyp/core.gyp
index 237fbaf,0fbc56c..fbe073b
--- 1/gyp/core.gyp
--- 2/gyp/core.gyp
+++ b/gyp/core.gyp
@@@ -12,16 -12,10 +12,12 @@@
        'standalone_static_library': 1,
        'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
  
-       'includes': [
-         'core.gypi',
-       ],
- 
        'include_dirs': [
          '../include/c',
 +        '../include/codec',
          '../include/config',
          '../include/core',
 +        '../include/effects',
          '../include/pathops',
          '../include/ports',
          '../include/private',

diff --cc gyp/effects.gyp
Simple merge

diff --cc src/core/SkBlitter.cpp
Simple merge

diff --cc src/core/SkScan_AntiPath.cpp
Simple merge

diff --cc src/ports/SkFontMgr_win_dw.cpp
Simple merge

diff --cc src/ports/SkRemotableFontMgr_win_dw.cpp
Simple merge

diff --cc tools/flags/SkCommonFlags.cpp
Simple merge