Don't add missing properties when reading contacts.  Code & test cleanup.

We don't need to keep repeating ContractsContract.CommonDataKinds everywhere
any more; nor should we add e.g. a null honorificPrefix property if no prefix
is present.

Also, clean up the automated test to better handle the differences between
iOS and Android.  NOTE WELL: there's some stuff in the test that's going
too far; these will need addressing later (e.g. what's up with
organization pref and type??).