Enable account switcher in contact creation

- remove account selection step before contact creation
- (phone) put account info on the right side of photos
  instead of having "header" for it
-- renamed header_* ids for account stuffs as they may not be
   part of header any more.
- add migration functionality to EntityModifier
- add test for it
- no optimal layout

Bug: 4184675
Change-Id: I0e777f9aa37a7c9145bd430f897f8068b0bede56
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 07de004..b531431 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1226,7 +1226,7 @@
     <string name="account_type_format"><xliff:g id="source" example="Gmail">%1$s</xliff:g> contact</string>
 
     <!-- String describing which account a contact came from when editing it -->
-    <string name="from_account_format">from <xliff:g id="source" example="user@gmail.com">%1$s</xliff:g></string>
+    <string name="from_account_format"><xliff:g id="source" example="user@gmail.com">%1$s</xliff:g></string>
 
     <!-- Checkbox asking the user if they want to display a particular photo for a contact -->
     <string name="use_photo_as_primary">Use this photo</string>