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

Change-Id: I4cce55eb365408aaea7422c289479f708cd1b18a