minor fix readme
fix typo
Merge pull request #316 from licaiguo/fix-readme

Fix readme
enable x86 asm for android
Add iOS support for decoder.
Merge pull request #317 from licaiguo/enable-x86asm-android

enable x86 asm for android
Merge pull request #318 from zhilwang/add-ios-decoder

Add iOS support for decoder.
Merge remote-tracking branch 'upstream/master' into travis.osx