Merge "libmedia: Improve charset detection."
am: d4dcfb32c3

Change-Id: I4d0050ce80d1075e7de0df50dd01b20a7e98e47b