merge "SkFontHost_FreeType constructor to correctly release resources." into nyc-dev am: ab20bed752 am: 7b25547e89
merge "SkFontHost_FreeType constructor to correctly release resources." into nyc-dev am: ab20bed752
am: 7b25547e89

* commit '7b25547e8910797642844d00a867f6662f8ea1a6':
  merge "SkFontHost_FreeType constructor to correctly release resources." into nyc-dev

Change-Id: I197fb338ebdee4acb11277c4475a0946a36fc0cb

Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,Hikari-no-Tenshi/android_external_skia,Hikari-no-Tenshi/android_external_skia