- fix for Android build
Merge branch '20130408-javascript' of github.com:openpeer/op into 20130408-javascript