Merge "Revert "Call ImageDecoder directly in ResourcesImpl""