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

Change-Id: I65de4174d6c058b10c23752f01b1da8164998cdc