Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	Android.mk
	bench/benchmain.cpp
	src/gpu/gl/GrGLProgram.cpp
	src/images/SkImageDecoder_libpng.cpp

Change-Id: I3bdb404a4e95106e5c2f1ac9022337a9253ee4ff