This reverts commit 22f63477.

Conflicts:
	canvas/source/cairo/cairo_canvasbitmap.cxx

Change-Id: Ib266050ebc6eaca4fbd36ed013ac95a1b4b9d316