Merge remote-tracking branch 'remotes/aosp/kitkat-mr2-release' into HEAD

Conflicts:
	src/core/SkBitmap.cpp

Change-Id: I402991d431501ade4e5799f5795ff85ae547596f
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>