Merge "Make Bitmap.get/setPixel[s] color space aware"