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

Change-Id: Ida1cc2fa8a824a85813fc57662c394e0344349d6