Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

src/core/SkBlitter_Sprite.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSmallAllocator.h"
 #include "SkSpriteBlitter.h"
 
@@ skipping 49 matching lines @@
         (which does respect soft edges).
     */
     SkASSERT(allocator != NULL);
 
     SkSpriteBlitter* blitter;
 
     switch (device.colorType()) {
         case kRGB_565_SkColorType:
             blitter = SkSpriteBlitter::ChooseD16(source, paint, allocator);
             break;
-        case kPMColor_SkColorType:
+        case kN32_SkColorType:
             blitter = SkSpriteBlitter::ChooseD32(source, paint, allocator);
             break;
         default:
             blitter = NULL;
             break;
     }
 
     if (blitter) {
         blitter->setup(device, left, top, paint);
     }
     return blitter;
 }