Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

gm/bitmappremul.cpp

Index: gm/bitmappremul.cpp
diff --git a/gm/bitmappremul.cpp b/gm/bitmappremul.cpp
index fd563eb7757367320bcce284d416e1d2e4acbcf9..e315fafdde4687cdc0c2c3bab7abdb7f17782080 100644
--- a/gm/bitmappremul.cpp
+++ b/gm/bitmappremul.cpp
@@ -30,7 +30,7 @@
 
 static SkBitmap make_argb8888_gradient() {
     SkBitmap bitmap;
-    init_bitmap(kPMColor_SkColorType, &bitmap);
+    init_bitmap(kN32_SkColorType, &bitmap);
     uint8_t rowColor = 0;
     for (int y = 0; y < SLIDE_SIZE; y++) {
         uint32_t* dst = bitmap.getAddr32(0, y);
@@ -64,7 +64,7 @@
 
 static SkBitmap make_argb8888_stripes() {
     SkBitmap bitmap;
-    init_bitmap(kPMColor_SkColorType, &bitmap);
+    init_bitmap(kN32_SkColorType, &bitmap);
     uint8_t rowColor = 0;
     for (int y = 0; y < SLIDE_SIZE; y++) {
         uint32_t* dst = bitmap.getAddr32(0, y);