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

Change-Id: I0698b94e6b76043a7950d99933120a6a1f4b2173