Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev
am: 101dc265a8

Change-Id: Ia6d620a6f4df4e7fdbceae5a6f3bc524aae4358e