Update freetype to the latest version of Android external/freetype

src/autofit/afpic.c

 /***************************************************************************/
 /*                                                                         */
 /*  afpic.c                                                                */
 /*                                                                         */
 /*    The FreeType position independent code services for autofit module.  */
 /*                                                                         */
 /*  Copyright 2009, 2010, 2011 by                                          */
 /*  Oran Agra and Mickey Gabel.                                            */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_INTERNAL_OBJECTS_H
 #include "afpic.h"
+#include "aferrors.h"
 
 #ifdef FT_CONFIG_OPTION_PIC
 
   /* forward declaration of PIC init functions from afmodule.c */
-  void FT_Init_Class_af_autofitter_service( FT_Library,
-                                            FT_AutoHinter_ServiceRec* );
+  void FT_Init_Class_af_autofitter_service(
+    FT_Library                 library,
+    FT_AutoHinter_ServiceRec*  clazz );
 
   /* forward declaration of PIC init functions from script classes */
 #include "aflatin.h"
+#ifdef FT_OPTION_AUTOFIT2
 #include "aflatin2.h"
+#endif
 #include "afcjk.h"
 #include "afdummy.h"
 #include "afindic.h"
 
   void
   autofit_module_class_pic_free( FT_Library  library )
   {
     FT_PIC_Container*  pic_container = &library->pic_container;
     FT_Memory          memory        = library->memory;
 
@@ skipping 23 matching lines @@
     pic_container->autofit = container;
 
     /* initialize pointer table -                       */
     /* this is how the module usually expects this data */
     for ( ss = 0 ; ss < AF_SCRIPT_CLASSES_REC_COUNT ; ss++ )
     {
       container->af_script_classes[ss] =
         &container->af_script_classes_rec[ss];
     }
     container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL;
-    
+
     /* add call to initialization function when you add new scripts */
     ss = 0;
     FT_Init_Class_af_dummy_script_class(
       &container->af_script_classes_rec[ss++] );
 #ifdef FT_OPTION_AUTOFIT2
     FT_Init_Class_af_latin2_script_class(
       &container->af_script_classes_rec[ss++] );
 #endif
     FT_Init_Class_af_latin_script_class(
       &container->af_script_classes_rec[ss++] );
@@ skipping 10 matching lines @@
     if ( error )
       autofit_module_class_pic_free( library );
     return error;
   }
 
 
 #endif /* FT_CONFIG_OPTION_PIC */
 
 
 /* END */