Merge "Revert "Use ImageDecoder for BitmapDrawable""