Snapshot from http://skia.googlecode.com/svn/trunk@8255

Change-Id: I4666e04b05c7d2f2f0f25204b20b302e7d161d85
Snapshot from http://skia.googlecode.com/svn/trunk@8352

Change-Id: I09dbe7f21185e6c22f04edbaf46de2f5c620e475
Merge Skia r8352 into Android

Change-Id: Id9945639617af9802b3d16a5f8485469125e8545
Fix exported include directories.

Use correct variable name for the list of exported directories.

Change-Id: Ic39cdb5cb9ec2c8d0a93b33601a4b679e22f4241
am eb323f3d: Add liblog

* commit 'eb323f3df1f2d2d2ac7c368f2e4584ca197c738d':
  Add liblog
am e05129fc: Merge "Add additional scripts in font mapping" into jb-mr2-dev

* commit 'e05129fc0eb58baa033b4d309cc2db03e262ee9e':
  Add additional scripts in font mapping
am e2dc2d7f: Fix skia generation counting in getFontMetrics

* commit 'e2dc2d7f2acec9dc1e1d577a14b3f6e8efd3be71':
  Fix skia generation counting in getFontMetrics
am fa3c0268: Merge "Add support for CMYK jpeg images." into jb-mr2-dev

* commit 'fa3c026835b4e2fa13f21d56d3299922fca6815f':
  Add support for CMYK jpeg images.
Move emoji support out of libskia and into libwebcore.

These emoji files are only used by libwebcore and are not part of
the core Skia library.  This CL should only be committed after
the companion CL has been submitted to external/webkit.

bug: 8719528
Change-Id: I27ce95f5c6f51c967d9f370d576321b2d6fd2c41
am d4e621de: resolved conflicts for merge of 52454e14 to jb-mr2-dev-plus-aosp

* commit 'd4e621de189a48cbaeed7848eb9c8c80b1276170':
  skia: Don't use -D_FORTIFY_SOURCE=2
Snapshot from http://skia.googlecode.com/svn/trunk@9231

Change-Id: I384e5f43ceb90b1a2e58a1e33753b3e79c85b949
Snapshot from http://skia.googlecode.com/svn/trunk@9286

Change-Id: I07f49058086dc8e7893cf10d33fca6773bf5508e
Merge Skia r9286 into android.

Conflicts:
	include/core/SkFontHost.h
	include/core/SkPaint.h
	include/core/SkScalar.h
	include/ports/SkTypeface_android.h
	src/core/SkPaint.cpp
	src/core/SkScalerContext.cpp
	src/core/SkScalerContext.h

bug: 8719528
Change-Id: Icf2f43cfaacc6f0a0fa1965b2c1f4d2b957e9982
am 9a8580ee: (-s ours) Skia changes needed to support gpl build for external/webkit

* commit '9a8580ee604a01c63d29fc043b67b189c2d946d9':
  Skia changes needed to support gpl build for external/webkit
Fix issues related to resolving fonts based on name.

1) non-system font files are not added to the cache.
2) We cache the default fonts for quick lookup.

This is a cherry-pick of Skia r9441.

bug: 9229698
Change-Id: I0ccf3775c8496886d2b0d841b85693154efcc096
am fcdba6fd: (-s ours) Revert "Skia changes needed to support gpl build for external/webkit"

* commit 'fcdba6fd7014ad0619cf089e73e5e0f9e759d8cc':
  Revert "Skia changes needed to support gpl build for external/webkit"
am e79c29fa: (-s ours) Better tweaks for forward compatibility

* commit 'e79c29fa055866094176c87aadb193b8c6d1a305':
  Better tweaks for forward compatibility
Fix issues related to resolving fonts based on name.

1) non-system font files are not added to the cache.
2) We cache the default fonts for quick lookup.

This is a cherry-pick of Skia r9441.

bug: 9229698
Change-Id: I0ccf3775c8496886d2b0d841b85693154efcc096
Fix crash when attempting to use a font fallback chain with a custom font.

bug: 9315679
Change-Id: Ib38e190af91c1907225165bab2d74a7eea7adcdd
Fix crash when attempting to use a font fallback chain with a custom font.

bug: 9315679
Change-Id: Ib38e190af91c1907225165bab2d74a7eea7adcdd