Merge commit 'e9f90a21c05c630062ce790e32a4b21405c631bd' into reomte

Conflicts:
	src/codec/SkJpegCodec.cpp

Change-Id: If35ef478ace8dd4ae4f195d8808d772c65c366b4