- some incorrect ifdefs for ANDROID
- fixed some compile issues related to android
- fixed peek ambiguity
Merge branch '20140401-dev-stable' into feature-20140521-push-messaging