Merge "remove pixelflinger from recovery"

    libmincrypt \

    libminadbd \

    libminui \

    libpixelflinger_static \

    libpng \

    libfs_mgr \

    libcutils \

extern "C" {

#endif

typedef void* gr_surface;

typedef unsigned short gr_pixel;

typedef struct {

    int width;

    int height;

    int row_bytes;

    int pixel_bytes;

    unsigned char* data;

} GRSurface;

typedef GRSurface* gr_surface;

int gr_init(void);

void gr_exit(void);

int gr_fb_width(void);

int gr_fb_height(void);

gr_pixel *gr_fb_data(void);

void gr_flip(void);

void gr_fb_blank(bool blank);

void gr_clear();  // clear entire surface to current color

void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a);

void gr_fill(int x1, int y1, int x2, int y2);

int gr_text(int x, int y, const char *s, int bold);

void gr_text(int x, int y, const char *s, int bold);

void gr_texticon(int x, int y, gr_surface icon);

int gr_measure(const char *s);

void gr_font_size(int *x, int *y);

#include "cutils/log.h"

#include "mtdutils.h"

#ifdef LOG_TAG

#undef LOG_TAG

#endif

#define LOG_TAG "flash_image"

#define HEADER_SIZE 2048  // size of header to compare for equality