Merge "Undefine PNG_READ_OPT_PLTE_SUPPORTED" am: 4bc5f654f4
am: 7cfd88bba9

Change-Id: I0450db21d43160e19174c4c0787289c9e7ffb738