Android Billing crash fix (hopefully). GCM Crash Fix (hopefullu)
Merge remote-tracking branch 'origin/altego' into altego