Merge "Add in/out ColorSpace to ImageDecoder" into pi-dev am: bf1fe9aecd
am: 8f935b0fbb

Change-Id: I1a0d03fb9ca51276dc1907fd4cd2d2685fc46a46