Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Conflicts:
	Android.mk
	include/core/SkShader.h
	include/ports/SkFontConfigInterface.h
	src/core/SkBitmap.cpp
	src/core/SkTypeface.cpp
	src/core/SkTypefaceCache.h
	src/images/SkImageDecoder_libgif.cpp

Change-Id: I5bc5a94027922fbb096b7c43f4a56842674208e3
TEMPORARY: Disable qc-perf

It needs to be updated for the new skia

Change-Id: I419f8238657541fb6640ef46192f534dbf3670ba
Revert "1st try to fix SkTypefaceCache"

This reverts commit 50dbe1892cf00ccfabe9c970222da615263d632c.
Merge branch 'kk' of git://github.com/CarbonDev/android_external_skia into ckk

Conflicts:
	src/core/SkBitmap.cpp
added missing function to SkTypefaceCache.h