Merge "Add logging and null check for SkColorSpace serialization" into oc-dev am: d00e242ce7
am: 9a343a3099

Change-Id: Ie684b0a920e3ae8246b1f5b5bf530ab4d0d27e59