(cherry picked from commit e811ac44)

Conflicts:
	canvas/source/cairo/cairo_devicehelper.cxx

Change-Id: I0419259723c3dfca22263af9b858bb07141b179e