Merge "Clean-ups for BitmapRegionDecoder"