Merge "Snap for 5234541 from 2f4a5d7c42cf1f3220fc652c83343ad9c256444f to sdk-release" into sdk-release

README.android

diff --git a/README.android b/README.android
index 80e837e..5f94dc9 100644
--- a/README.android
+++ b/README.android
@@ -10,4 +10,5 @@
 
 (2) pnglibconf.h
     This is copied from scripts/pnglibconf.h.prebuilt.
-    Android has undefined PNG_WARNINGS_SUPPORTED.
+    Android has undefined PNG_WARNINGS_SUPPORTED and
+    PNG_READ_OPT_PLTE_SUPPORTED.

pnglibconf.h

diff --git a/pnglibconf.h b/pnglibconf.h
index 366cdc6..32e60aa 100644
--- a/pnglibconf.h
+++ b/pnglibconf.h
@@ -65,7 +65,7 @@
 #define PNG_READ_INT_FUNCTIONS_SUPPORTED
 #define PNG_READ_INVERT_ALPHA_SUPPORTED
 #define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
+/*#undef PNG_READ_OPT_PLTE_SUPPORTED*/
 #define PNG_READ_PACKSWAP_SUPPORTED
 #define PNG_READ_PACK_SUPPORTED
 #define PNG_READ_QUANTIZE_SUPPORTED