Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType.

samplecode/SampleFilter.cpp

Index: samplecode/SampleFilter.cpp
diff --git a/samplecode/SampleFilter.cpp b/samplecode/SampleFilter.cpp
index 7b2c5516a2aee90783f6f71b9307b8001a2dc41d..e17a33c3d4226000e5be3e9a8e91eeec5b8a4407 100644
--- a/samplecode/SampleFilter.cpp
+++ b/samplecode/SampleFilter.cpp
@@ -91,7 +91,7 @@
         make_bm(&fBM8);
         fBM8.copyTo(&fBM4444, kARGB_4444_SkColorType);
         fBM8.copyTo(&fBM16, kRGB_565_SkColorType);
-        fBM8.copyTo(&fBM32, kPMColor_SkColorType);
+        fBM8.copyTo(&fBM32, kN32_SkColorType);
 
         this->setBGColor(0xFFDDDDDD);
     }