Merge "libmedia: Improve charset detection."