Improve on the #ifdef mess in ogl_display.c.

I left some #ifdef ALLEGRO_ANDROID lines following uses of the
ALLEGRO_PROGRAMMABLE_PIPELINE macro in case it would break compilation
on some platforms, but they should be removeable later.
make_converters: Conform to move of ALLEGRO_PIXEL_FORMAT to color.h