Merge "cm: Also Bump GSM Hero to RC4" into gingerbread