Merge tag 'android-4.4.3_r1.1' into HEAD

Conflicts:
	Android.mk
	include/ports/SkFontConfigInterface.h
	src/core/SkTypeface.cpp
	src/core/SkTypefaceCache.cpp
	src/core/SkTypefaceCache.h
	src/ports/SkFontConfigInterface_android.cpp
	src/ports/SkFontConfigParser_android.cpp