Merge "Xform bitmaps to sRGB on SW and PDF canvases" into oc-dev
am: c29dffed16

Change-Id: I5a62876593d2e4423758bce57c8b82e9bdb3864c