Always update card type for all card constructors

This will fix Amex number validation when using card constructors with address/zip.
Merge branch 'master' of github.com:cbliu/stripe-android into cbliu-master
Merge branch 'cbliu-master' into phil-fixes