Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev