Allow clients to use alternative name ordering.

Change-Id: I3d1020ca1365eb6935195c1711e52877d9483f10
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/opt/vcard into 1.1

Android 4.2.2 release 1
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Merge remote-tracking branch 'cm/cm-11.0' into kk4.4