fix android red and blue channel swap on jpegs w/ 24bit RGB surface

that was introduced with 54596087
without adjusting for Android accordingly

Change-Id: Ie6a2001ab13ecec959da9b57bb49e1bac76e8691

external/cairo/cairo/cairo.GL_RGBA.patch

@@ -32,7 +32,13 @@
  	break;
      case CAIRO_FORMAT_RGB30:
  	ret = PIXMAN_x2r10g10b10;
-@@ -328,7 +328,7 @@
+@@ -323,12 +323,12 @@
+ 	ret = PIXMAN_r5g6b5;
+ 	break;
+ 	case CAIRO_FORMAT_RGB24_888:
+-	ret = PIXMAN_r8g8b8;
++	ret = PIXMAN_b8g8r8; // tweaked
+ 	break;
      case CAIRO_FORMAT_ARGB32:
      case CAIRO_FORMAT_INVALID:
      default: