CharsetConverter: fix wrong locking of mutex
FIX: [stagefright] fixup kitkat; remove hardcoded api limitation
Merge pull request #3711 from koying/fixstfkitkat

FIX: [stagefright] fixup kitkat; remove hardcoded api limitation