Fix Google3 fonts.

tools/BUILD.public.expected

Index: tools/BUILD.public.expected
diff --git a/tools/BUILD.public.expected b/tools/BUILD.public.expected
index 950f14895e5f30d6462782f35df7226e2101a21a..de0a5f80577a3bf21012e70c78298bb44e7ca484 100644
--- a/tools/BUILD.public.expected
+++ b/tools/BUILD.public.expected
@@ -723,6 +723,7 @@ BASE_SRCS = ['include/private/SkAtomics.h',
  'src/effects/gradients/SkTwoPointConicalGradient.h',
  'src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
  'src/effects/gradients/SkTwoPointConicalGradient_gpu.h',
+ 'src/fonts/SkFontMgr_fontconfig.cpp',
  'src/fonts/SkFontMgr_indirect.cpp',
  'src/fonts/SkGScalerContext.cpp',
  'src/fonts/SkGScalerContext.h',
@@ -913,6 +914,8 @@ BASE_SRCS = ['include/private/SkAtomics.h',
  'src/gpu/batches/GrDrawPathBatch.h',
  'src/gpu/batches/GrDrawVerticesBatch.cpp',
  'src/gpu/batches/GrDrawVerticesBatch.h',
+ 'src/gpu/batches/GrNinePatch.cpp',
+ 'src/gpu/batches/GrNinePatch.h',
  'src/gpu/batches/GrNonAAFillRectBatch.cpp',
  'src/gpu/batches/GrNonAAFillRectBatch.h',
  'src/gpu/batches/GrNonAAStrokeRectBatch.cpp',
@@ -1471,11 +1474,16 @@ BASE_SRCS_PLATFORM = ['*** BEGIN CONDITION_IOS ***',
  'src/opts/opts_check_x86.cpp',
  'src/ports/SkDebug_stdio.cpp',
  'src/ports/SkDiscardableMemory_none.cpp',
+ 'src/ports/SkFontConfigInterfaceDirect.cpp',
+ 'src/ports/SkFontConfigInterfaceDirect.h',
+ 'src/ports/SkFontConfigInterface_direct_google3.cpp',
+ 'src/ports/SkFontConfigTypeface.h',
  'src/ports/SkFontHost_FreeType.cpp',
  'src/ports/SkFontHost_FreeType_common.cpp',
  'src/ports/SkFontHost_FreeType_common.h',
+ 'src/ports/SkFontHost_fontconfig.cpp',
  'src/ports/SkFontMgr_custom.cpp',
- 'src/ports/SkFontMgr_custom_directory_factory.cpp',
+ 'src/ports/SkFontMgr_fontconfig.cpp',
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
@@ -1566,11 +1574,16 @@ BASE_SRCS_UNIX = ['src/opts/Sk4px_SSE2.h',
  'src/opts/opts_check_x86.cpp',
  'src/ports/SkDebug_stdio.cpp',
  'src/ports/SkDiscardableMemory_none.cpp',
+ 'src/ports/SkFontConfigInterfaceDirect.cpp',
+ 'src/ports/SkFontConfigInterfaceDirect.h',
+ 'src/ports/SkFontConfigInterface_direct_google3.cpp',
+ 'src/ports/SkFontConfigTypeface.h',
  'src/ports/SkFontHost_FreeType.cpp',
  'src/ports/SkFontHost_FreeType_common.cpp',
  'src/ports/SkFontHost_FreeType_common.h',
+ 'src/ports/SkFontHost_fontconfig.cpp',
  'src/ports/SkFontMgr_custom.cpp',
- 'src/ports/SkFontMgr_custom_directory_factory.cpp',
+ 'src/ports/SkFontMgr_fontconfig.cpp',
  'src/ports/SkGlobalInitialization_default.cpp',
  'src/ports/SkImageGenerator_skia.cpp',
  'src/ports/SkMemory_malloc.cpp',
@@ -1844,6 +1857,7 @@ DM_SRCS = ['dm/DM.cpp',
  'gm/skbug_257.cpp',
  'gm/smallarc.cpp',
  'gm/smallimage.cpp',
+ 'gm/smallpaths.cpp',
  'gm/spritebitmap.cpp',
  'gm/srcmode.cpp',
  'gm/stlouisarch.cpp',
@@ -2187,6 +2201,7 @@ INCLUDES = ['include/android',
  'src/image',
  'src/lazy',
  'src/opts',
+ 'src/ports',
  'src/pdf',
  'src/sfnt',
  'src/utils',