Merge "Use free for memory chunks allocated through memalign."

libs/hwui/FontRenderer.cpp

@@ -797,7 +797,7 @@ void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, int
     mRsScript->blur(ain, aout);
 
     // replace the original image's pointer, avoiding a copy back to the original buffer
-    delete *image;
+    free(*image);
     *image = outImage;
 }
 

libs/hwui/TextDropShadowCache.cpp

@@ -222,7 +222,7 @@ ShadowTexture* TextDropShadowCache::get(SkPaint* paint, const char* text, uint32
         }
 
         // Cleanup shadow
-        delete shadow.image;
+        free(shadow.image);
     }
 
     return texture;