Fix BGRA readback on Android

R=bsalomon@google.com, robertphillips@google.com

Author: snorp@snorp.net

Review URL: https://chromiumcodereview.appspot.com/22522002

git-svn-id: http://skia.googlecode.com/svn/trunk@10624 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index edcb646..24f5954 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -345,15 +345,10 @@
             static const SkCanvas::Config8888 gReadConfigs[] = {
                 SkCanvas::kNative_Premul_Config8888,
                 SkCanvas::kNative_Unpremul_Config8888,
-/**
-    * There is a bug in Ganesh (http://code.google.com/p/skia/issues/detail?id=438)
-    * that causes the readback of pixels from BGRA canvas to an RGBA bitmap to
-    * fail. This should be removed as soon as the issue above is resolved.
-    */
-#if !defined(SK_BUILD_FOR_ANDROID)
+
                 SkCanvas::kBGRA_Premul_Config8888,
                 SkCanvas::kBGRA_Unpremul_Config8888,
-#endif
+
                 SkCanvas::kRGBA_Premul_Config8888,
                 SkCanvas::kRGBA_Unpremul_Config8888,
             };