Overhaul contact encoding in Android; encode phone type too

git-svn-id: http://zxing.googlecode.com/svn/trunk@3012 59b500cc-1b3d-0410-9834-0bbf25fbcc57