fix about wss support in Android 4.0
Merge branch 'hotfix'
Merge branch 'master' into develop