Android 4.1.1 release 4
Merge "Revise png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-3048)"