MOE automated commit.

Use ResourceIds instead of depending on R.raw.canonical in 
CanonicalBitmap.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173974844

Author: sjudd

instrumentation/src/androidTest/java/com/bumptech/glide/test/CanonicalBitmap.java

@@ -6,7 +6,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.test.InstrumentationRegistry;
-import com.bumptech.glide.instrumentation.R;
 import com.bumptech.glide.util.Preconditions;
 
 public final class CanonicalBitmap {
@@ -41,7 +40,8 @@ private Bitmap decodeBitmap() {
     Context context = InstrumentationRegistry.getTargetContext();
     BitmapFactory.Options options = new BitmapFactory.Options();
     options.inScaled = false;
-    Bitmap result = BitmapFactory.decodeResource(context.getResources(), R.raw.canonical, options);
+    int resourceId = ResourceIds.raw.canonical;
+    Bitmap result = BitmapFactory.decodeResource(context.getResources(), resourceId, options);
     if (scaleFactor != null) {
       result = Bitmap.createScaledBitmap(
           result,

instrumentation/src/androidTest/java/com/bumptech/glide/test/ResourceIds.java

@@ -15,6 +15,7 @@ private ResourceIds() {
 
   public interface raw {
     int dl_world_anim = getResourceId("raw", "dl_world_anim");
+    int canonical = getResourceId("raw", "canonical");
   }
 
   public interface drawable {