Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/utils/SkBitmapHasher.cpp

Index: src/utils/SkBitmapHasher.cpp
diff --git a/src/utils/SkBitmapHasher.cpp b/src/utils/SkBitmapHasher.cpp
index 6c861cd04bc261c52e35c1d1769703c295b8e611..bd038ddaa05d20f2717dff7867d1ccfb692d73f8 100644
--- a/src/utils/SkBitmapHasher.cpp
+++ b/src/utils/SkBitmapHasher.cpp
@@ -57,7 +57,7 @@
     // Hmm, that didn't work. Maybe if we create a new
     // kARGB_8888_Config version of the bitmap it will work better?
     SkBitmap copyBitmap;
-    if (!bitmap.copyTo(&copyBitmap, kPMColor_SkColorType)) {
+    if (!bitmap.copyTo(&copyBitmap, kN32_SkColorType)) {
         return false;
     }
     return ComputeDigestInternal(copyBitmap, result);