clean up MMS contact more, manually integrate bug fixes from Eclair MR3.
clean up MMS contact more, manually integrate bug fixes from Eclair MR3.

- integrate change to speed up contact query.
- fixes contact query threading bug that could result in the contact cache containing the wrong number.
- fixes usage of synchronized block, synchronize on the contact object when updating the contact.

bmaupin/android-sms-plus