Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/core/SkSpriteBlitter_ARGB32.cpp

Index: src/core/SkSpriteBlitter_ARGB32.cpp
diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp
index b05e5033e44d1334fd710847df3d57357d11bf5e..a4ae41c689befaf2a746965bad675a673f1d9a6c 100644
--- a/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/src/core/SkSpriteBlitter_ARGB32.cpp
@@ -20,7 +20,7 @@
 class Sprite_D32_S32 : public SkSpriteBlitter {
 public:
     Sprite_D32_S32(const SkBitmap& src, U8CPU alpha)  : INHERITED(src) {
-        SkASSERT(src.colorType() == kPMColor_SkColorType);
+        SkASSERT(src.colorType() == kN32_SkColorType);
 
         unsigned flags32 = 0;
         if (255 != alpha) {
@@ -289,7 +289,7 @@
                 blitter = allocator->createT<Sprite_D32_S4444>(source);
             }
             break;
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             if (xfermode || filter) {
                 if (255 == alpha) {
                     // this can handle xfermode or filter, but not alpha