Revert "change SkColorTable to be immutable"

src/opts/SkBitmapProcState_opts_arm.cpp

 /*
  * Copyright 2009 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 "SkBitmapProcState.h"
 #include "SkColorPriv.h"
@@ skipping 166 matching lines @@
                       "ldr        r6, [%[table], r5, lsl #2]      \n\t"   // load SkPMColor from colmap
                       "str        r6, [%[colors]], #4             \n\t"   // store pixel, update ptr
                       "bne        3b                              \n\t"   // loop if counter != 0
                       "4:                                             \n\t"   // exit
                       : [xx] "+r" (xx), [count] "+r" (count), [colors] "+r" (colors)
                       : [table] "r" (table), [srcAddr] "r" (srcAddr)
                       : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11"
                       );
     }
 
-    s.fBitmap->getColorTable()->unlockColors();
+    s.fBitmap->getColorTable()->unlockColors(false);
 }
 #endif // SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /*  If we replace a sampleproc, then we null-out the associated shaderproc,
     otherwise the shader won't even look at the matrix/sampler
  */
 void SkBitmapProcState::platformProcs() {
     bool isOpaque = 256 == fAlphaScale;
@@ skipping 215 matching lines @@
         // to operate on four rows at once, which is correct but not performance-optimal.
 
         // procs->fConvolve4RowsHorizontally = &convolve4RowsHorizontally_arm;
 
         procs->fConvolve4RowsHorizontally = NULL;
 
         procs->fConvolveHorizontally = &convolveHorizontally_arm;
         procs->fApplySIMDPadding = &applySIMDPadding_arm;
     }
 }