Add NAME_RAW_CONTACT_ID to view_contacts

Change-Id: Ib889d1cc43e4551b9f7887bf3c808140f2bf16a3
Start weaning NameNormalizer off icu4jni implementation details.

Minor reshuffling necessary to keep building with the Java 6 API changes
post-froyo. This is compatible with the Java 5 API, and needs only an import
change to be compatible with the Java 6 API.

Ideally, this class should only be using public API, but I don't think
anyone has time for that right now.

Bug: 2417080
Change-Id: I40ac70a62ccf0a096a5635cc0499699b8bb69498
Merge commit '80d7871ca31d604cbfd857661d5300bb090076db' into testMerges

* commit '80d7871ca31d604cbfd857661d5300bb090076db':
  Add NAME_RAW_CONTACT_ID to view_contacts

Conflicts:
	src/com/android/providers/contacts/ContactsDatabaseHelper.java
Merge commit '633d446a21eaceecc0948893769f82163f1cb1e5' into testMerges

* commit '633d446a21eaceecc0948893769f82163f1cb1e5':
  Start weaning NameNormalizer off icu4jni implementation details.