Merge pull request #20 from realpaul/master

[CLOUDSRV-2929] Catchup CLOUDSRV-2829 on Cocoafish Android SDK side / Push service crashed on Android 2.x