Various updates to GCM from Java build