- some incorrect ifdefs for ANDROID
- temporary socket fix
https://github.com/openpeer/opandroid/issues/423
Merge branch '20140401-dev-stable' into feature-20140521-push-messaging