Merge "Revert "Use ImageDecoder for NinePatchDrawable and BitmapDrawable""