Merge "Remove ImageViewBitmapDrawable class"