Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev
am: 33813bd439

Change-Id: I5862310360b3532b5c59eda6bae95e8922e0bb08