Merge "Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7 am: f713a1960e"